author | James Morris <jmorris@namei.org> | |
Tue, 24 May 2011 13:20:19 +0000 (23:20 +1000) | ||
committer | James Morris <jmorris@namei.org> | |
Tue, 24 May 2011 13:20:19 +0000 (23:20 +1000) |
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>
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>
1 | 2 | |||
---|---|---|---|---|
MAINTAINERS | patch | | diff1 | | diff2 | | blob | history |
security/selinux/avc.c | patch | | diff1 | | diff2 | | blob | history |
security/selinux/hooks.c | patch | | diff1 | | diff2 | | blob | history |
security/selinux/selinuxfs.c | patch | | diff1 | | diff2 | | blob | history |
security/selinux/ss/services.c | patch | | diff1 | | diff2 | | blob | history |
security/smack/smack_lsm.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc MAINTAINERS
Simple merge
diff --cc security/selinux/avc.c
Simple merge
diff --cc security/selinux/hooks.c
index 8fb248843009de5e6b71a01cae7b884cd597ba36,9f426b8a12b5409b312349536453fa7b7bb89a56..a0d38459d650af32fe844ca18d4b5ff5ad03be98
+++ b/security/selinux/hooks.c
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);
diff --cc security/selinux/selinuxfs.c
Simple merge
diff --cc security/selinux/ss/services.c
Simple merge
diff --cc security/smack/smack_lsm.c
Simple merge