diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-06-20 19:44:08 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-20 01:43:27 -0400 |
commit | cf1dd1dae851ce5765cda5de16aa965eef7c2dbf (patch) | |
tree | 5ee564e56eca307701ce155e30a2cbb05b9937e3 | |
parent | e74f71eb78a4a8b9eaf1bc65f20f761648e85f76 (diff) |
selinux: don't transliterate MAY_NOT_BLOCK to IPERM_FLAG_RCU
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | security/selinux/avc.c | 2 | ||||
-rw-r--r-- | security/selinux/hooks.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/security/selinux/avc.c b/security/selinux/avc.c index d515b2128a4e..dca1c22d9276 100644 --- a/security/selinux/avc.c +++ b/security/selinux/avc.c | |||
@@ -527,7 +527,7 @@ int avc_audit(u32 ssid, u32 tsid, | |||
527 | * happened a little later. | 527 | * happened a little later. |
528 | */ | 528 | */ |
529 | if ((a->type == LSM_AUDIT_DATA_INODE) && | 529 | if ((a->type == LSM_AUDIT_DATA_INODE) && |
530 | (flags & IPERM_FLAG_RCU)) | 530 | (flags & MAY_NOT_BLOCK)) |
531 | return -ECHILD; | 531 | return -ECHILD; |
532 | 532 | ||
533 | a->selinux_audit_data.tclass = tclass; | 533 | a->selinux_audit_data.tclass = tclass; |
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 47a059fff344..eb5d5cdf3c51 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
@@ -2665,7 +2665,7 @@ static int selinux_inode_permission(struct inode *inode, int mask) | |||
2665 | struct common_audit_data ad; | 2665 | struct common_audit_data ad; |
2666 | u32 perms; | 2666 | u32 perms; |
2667 | bool from_access; | 2667 | bool from_access; |
2668 | unsigned __flags = mask & MAY_NOT_BLOCK ? IPERM_FLAG_RCU : 0; | 2668 | unsigned flags = mask & MAY_NOT_BLOCK; |
2669 | 2669 | ||
2670 | from_access = mask & MAY_ACCESS; | 2670 | from_access = mask & MAY_ACCESS; |
2671 | mask &= (MAY_READ|MAY_WRITE|MAY_EXEC|MAY_APPEND); | 2671 | mask &= (MAY_READ|MAY_WRITE|MAY_EXEC|MAY_APPEND); |
@@ -2682,7 +2682,7 @@ static int selinux_inode_permission(struct inode *inode, int mask) | |||
2682 | 2682 | ||
2683 | perms = file_mask_to_av(inode->i_mode, mask); | 2683 | perms = file_mask_to_av(inode->i_mode, mask); |
2684 | 2684 | ||
2685 | return inode_has_perm(cred, inode, perms, &ad, __flags); | 2685 | return inode_has_perm(cred, inode, perms, &ad, flags); |
2686 | } | 2686 | } |
2687 | 2687 | ||
2688 | static int selinux_inode_setattr(struct dentry *dentry, struct iattr *iattr) | 2688 | static int selinux_inode_setattr(struct dentry *dentry, struct iattr *iattr) |