diff options
Diffstat (limited to 'security/security.c')
-rw-r--r-- | security/security.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/security/security.c b/security/security.c index 47b8a447118f..7e34f98bf433 100644 --- a/security/security.c +++ b/security/security.c | |||
@@ -514,16 +514,14 @@ int security_inode_permission(struct inode *inode, int mask) | |||
514 | { | 514 | { |
515 | if (unlikely(IS_PRIVATE(inode))) | 515 | if (unlikely(IS_PRIVATE(inode))) |
516 | return 0; | 516 | return 0; |
517 | return security_ops->inode_permission(inode, mask); | 517 | return security_ops->inode_permission(inode, mask, 0); |
518 | } | 518 | } |
519 | 519 | ||
520 | int security_inode_exec_permission(struct inode *inode, unsigned int flags) | 520 | int security_inode_exec_permission(struct inode *inode, unsigned int flags) |
521 | { | 521 | { |
522 | if (unlikely(IS_PRIVATE(inode))) | 522 | if (unlikely(IS_PRIVATE(inode))) |
523 | return 0; | 523 | return 0; |
524 | if (flags) | 524 | return security_ops->inode_permission(inode, MAY_EXEC, flags); |
525 | return -ECHILD; | ||
526 | return security_ops->inode_permission(inode, MAY_EXEC); | ||
527 | } | 525 | } |
528 | 526 | ||
529 | int security_inode_setattr(struct dentry *dentry, struct iattr *attr) | 527 | int security_inode_setattr(struct dentry *dentry, struct iattr *attr) |