From: Eric Paris <eparis@redhat.com>
Date: Thu, 26 May 2011 21:20:14 +0000 (-0400)
Subject: Merge commit 'v2.6.39' into 20110526
X-Git-Tag: v3.0-rc4~32^2^2~2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=ea77f7a2e8561012cf100c530170f12351c3b53e

Merge commit 'v2.6.39' into 20110526

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

ea77f7a2e8561012cf100c530170f12351c3b53e
diff --cc security/selinux/hooks.c
index 9f426b8a12b5,8fb248843009..a0d38459d650
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@@ -2746,11 -2730,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);