diff options
author | NeilBrown <neilb@suse.de> | 2015-03-23 03:37:39 +0100 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-05-11 14:13:11 +0200 |
commit | bda0be7ad994812960e9f8f2d2757f72cb4a96cb (patch) | |
tree | f769e7c4511b64432438f82a8426248e75a8ad7b /security/security.c | |
parent | security/selinux: pass 'flags' arg to avc_audit() and avc_has_perm_flags() (diff) | |
download | linux-bda0be7ad994812960e9f8f2d2757f72cb4a96cb.tar.xz linux-bda0be7ad994812960e9f8f2d2757f72cb4a96cb.zip |
security: make inode_follow_link RCU-walk aware
inode_follow_link now takes an inode and rcu flag as well as the
dentry.
inode is used in preference to d_backing_inode(dentry), particularly
in RCU-walk mode.
selinux_inode_follow_link() gets dentry_has_perm() and
inode_has_perm() open-coded into it so that it can call
avc_has_perm_flags() in way that is safe if LOOKUP_RCU is set.
Calling avc_has_perm_flags() with rcu_read_lock() held means
that when avc_has_perm_noaudit calls avc_compute_av(), the attempt
to rcu_read_unlock() before calling security_compute_av() will not
actually drop the RCU read-lock.
However as security_compute_av() is completely in a read_lock()ed
region, it should be safe with the RCU read-lock held.
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security/security.c')
-rw-r--r-- | security/security.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/security/security.c b/security/security.c index d7c30b03e144..04c8feca081a 100644 --- a/security/security.c +++ b/security/security.c @@ -581,11 +581,12 @@ int security_inode_readlink(struct dentry *dentry) return security_ops->inode_readlink(dentry); } -int security_inode_follow_link(struct dentry *dentry) +int security_inode_follow_link(struct dentry *dentry, struct inode *inode, + bool rcu) { - if (unlikely(IS_PRIVATE(d_backing_inode(dentry)))) + if (unlikely(IS_PRIVATE(inode))) return 0; - return security_ops->inode_follow_link(dentry); + return security_ops->inode_follow_link(dentry, inode, rcu); } int security_inode_permission(struct inode *inode, int mask) |