diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-07 11:56:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-07 11:56:33 -0500 |
commit | b4a45f5fe8078bfc10837dbd5b98735058bc4698 (patch) | |
tree | df6f13a27610a3ec7eb4a661448cd779a8f84c79 /security/security.c | |
parent | 01539ba2a706ab7d35fc0667dff919ade7f87d63 (diff) | |
parent | b3e19d924b6eaf2ca7d22cba99a517c5171007b6 (diff) |
Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin
* 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin: (57 commits)
fs: scale mntget/mntput
fs: rename vfsmount counter helpers
fs: implement faster dentry memcmp
fs: prefetch inode data in dcache lookup
fs: improve scalability of pseudo filesystems
fs: dcache per-inode inode alias locking
fs: dcache per-bucket dcache hash locking
bit_spinlock: add required includes
kernel: add bl_list
xfs: provide simple rcu-walk ACL implementation
btrfs: provide simple rcu-walk ACL implementation
ext2,3,4: provide simple rcu-walk ACL implementation
fs: provide simple rcu-walk generic_check_acl implementation
fs: provide rcu-walk aware permission i_ops
fs: rcu-walk aware d_revalidate method
fs: cache optimise dentry and inode for rcu-walk
fs: dcache reduce branches in lookup path
fs: dcache remove d_mounted
fs: fs_struct use seqlock
fs: rcu-walk for path lookup
...
Diffstat (limited to 'security/security.c')
-rw-r--r-- | security/security.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/security/security.c b/security/security.c index e5fb07a3052d..739e40362f44 100644 --- a/security/security.c +++ b/security/security.c | |||
@@ -513,6 +513,15 @@ int security_inode_permission(struct inode *inode, int mask) | |||
513 | return security_ops->inode_permission(inode, mask); | 513 | return security_ops->inode_permission(inode, mask); |
514 | } | 514 | } |
515 | 515 | ||
516 | int security_inode_exec_permission(struct inode *inode, unsigned int flags) | ||
517 | { | ||
518 | if (unlikely(IS_PRIVATE(inode))) | ||
519 | return 0; | ||
520 | if (flags) | ||
521 | return -ECHILD; | ||
522 | return security_ops->inode_permission(inode, MAY_EXEC); | ||
523 | } | ||
524 | |||
516 | int security_inode_setattr(struct dentry *dentry, struct iattr *attr) | 525 | int security_inode_setattr(struct dentry *dentry, struct iattr *attr) |
517 | { | 526 | { |
518 | if (unlikely(IS_PRIVATE(dentry->d_inode))) | 527 | if (unlikely(IS_PRIVATE(dentry->d_inode))) |