diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-04-26 19:36:14 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-04-26 19:36:17 +0200 |
| commit | 7bd5fafeb414cf00deee32c82834f8bf1426b9ac (patch) | |
| tree | 1103053fa40576e9f9fc2818ea1910180e09b752 /security/security.c | |
| parent | fa7b69475a6c192853949ba496dd9c37b497b548 (diff) | |
| parent | ec75a71634dabe439db91c1ef51d5099f4493808 (diff) | |
Merge branch 'perf/urgent' into perf/stat
Merge reason: We want to queue up dependent changes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 101142369db..4ba6d4cc061 100644 --- a/security/security.c +++ b/security/security.c @@ -518,16 +518,14 @@ int security_inode_permission(struct inode *inode, int mask) { if (unlikely(IS_PRIVATE(inode))) return 0; - return security_ops->inode_permission(inode, mask); + return security_ops->inode_permission(inode, mask, 0); } int security_inode_exec_permission(struct inode *inode, unsigned int flags) { if (unlikely(IS_PRIVATE(inode))) return 0; - if (flags) - return -ECHILD; - return security_ops->inode_permission(inode, MAY_EXEC); + return security_ops->inode_permission(inode, MAY_EXEC, flags); } int security_inode_setattr(struct dentry *dentry, struct iattr *attr) |