aboutsummaryrefslogtreecommitdiffstats
path: root/security/selinux
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2011-04-21 20:23:19 -0400
committerEric Paris <eparis@redhat.com>2011-04-25 10:20:32 -0400
commit1c9904297451f558191e211a48d8838b4bf792b0 (patch)
tree9c7cabec6ce3d6604147de73953cfaca672f1c0d /security/selinux
parent6b697323a78bed254ee372f71b1a6a2901bb4b7a (diff)
SECURITY: Move exec_permission RCU checks into security modules
Right now all RCU walks fall back to reference walk when CONFIG_SECURITY is enabled, even though just the standard capability module is active. This is because security_inode_exec_permission unconditionally fails RCU walks. Move this decision to the low level security module. This requires passing the RCU flags down the security hook. This way at least the capability module and a few easy cases in selinux/smack work with RCU walks with CONFIG_SECURITY=y Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'security/selinux')
-rw-r--r--security/selinux/hooks.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 7a630a8a5cef..9a220be17a3f 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -2635,7 +2635,7 @@ static int selinux_inode_follow_link(struct dentry *dentry, struct nameidata *na
2635 return dentry_has_perm(cred, NULL, dentry, FILE__READ); 2635 return dentry_has_perm(cred, NULL, dentry, FILE__READ);
2636} 2636}
2637 2637
2638static int selinux_inode_permission(struct inode *inode, int mask) 2638static int selinux_inode_permission(struct inode *inode, int mask, unsigned flags)
2639{ 2639{
2640 const struct cred *cred = current_cred(); 2640 const struct cred *cred = current_cred();
2641 struct common_audit_data ad; 2641 struct common_audit_data ad;
@@ -2649,6 +2649,10 @@ static int selinux_inode_permission(struct inode *inode, int mask)
2649 if (!mask) 2649 if (!mask)
2650 return 0; 2650 return 0;
2651 2651
2652 /* May be droppable after audit */
2653 if (flags & IPERM_FLAG_RCU)
2654 return -ECHILD;
2655
2652 COMMON_AUDIT_DATA_INIT(&ad, FS); 2656 COMMON_AUDIT_DATA_INIT(&ad, FS);
2653 ad.u.fs.inode = inode; 2657 ad.u.fs.inode = inode;
2654 2658