From: James Morris <jmorris@namei.org>
Date: Tue, 24 May 2011 13:20:19 +0000 (+1000)
Subject: Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into for-linus
X-Git-Tag: v3.0-rc1~309^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=b7b57551bbda1390959207f79f2038aa7adb72ae;p=linux.git

Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into for-linus

Conflicts:
	lib/flex_array.c
	security/selinux/avc.c
	security/selinux/hooks.c
	security/selinux/ss/policydb.c
	security/smack/smack_lsm.c

Manually resolve conflicts.

Signed-off-by: James Morris <jmorris@namei.org>
---

b7b57551bbda1390959207f79f2038aa7adb72ae
diff --cc security/selinux/hooks.c
index 8fb248843009,9f426b8a12b5..a0d38459d650
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@@ -2730,11 -2746,11 +2748,11 @@@ static int selinux_inode_setxattr(struc
  	if (!(sbsec->flags & SE_SBLABELSUPP))
  		return -EOPNOTSUPP;
  
 -	if (!is_owner_or_cap(inode))
 +	if (!inode_owner_or_capable(inode))
  		return -EPERM;
  
- 	COMMON_AUDIT_DATA_INIT(&ad, FS);
- 	ad.u.fs.path.dentry = dentry;
+ 	COMMON_AUDIT_DATA_INIT(&ad, DENTRY);
+ 	ad.u.dentry = dentry;
  
  	rc = avc_has_perm(sid, isec->sid, isec->sclass,
  			  FILE__RELABELFROM, &ad);