aboutsummaryrefslogtreecommitdiffstats
path: root/security/security.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-06-20 19:48:41 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-07-20 01:43:29 -0400
commiteecdd358b467405a084d400d5ec571bbdbfe97a3 (patch)
tree357332873b909a19964e77dbae3c4aed5c100dc6 /security/security.c
parentcf1dd1dae851ce5765cda5de16aa965eef7c2dbf (diff)
->permission() sanitizing: don't pass flags to exec_permission()
pass mask instead; kill security_inode_exec_permission() since we can use security_inode_permission() instead. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security/security.c')
-rw-r--r--security/security.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/security/security.c b/security/security.c
index db3b750da353..0e4fccfef12c 100644
--- a/security/security.c
+++ b/security/security.c
@@ -521,16 +521,6 @@ int security_inode_permission(struct inode *inode, int mask)
521 return security_ops->inode_permission(inode, mask); 521 return security_ops->inode_permission(inode, mask);
522} 522}
523 523
524int security_inode_exec_permission(struct inode *inode, unsigned int flags)
525{
526 int mask = MAY_EXEC;
527 if (unlikely(IS_PRIVATE(inode)))
528 return 0;
529 if (flags)
530 mask |= MAY_NOT_BLOCK;
531 return security_ops->inode_permission(inode, mask);
532}
533
534int security_inode_setattr(struct dentry *dentry, struct iattr *attr) 524int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
535{ 525{
536 if (unlikely(IS_PRIVATE(dentry->d_inode))) 526 if (unlikely(IS_PRIVATE(dentry->d_inode)))