aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2019-04-10 14:03:45 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-05-25 18:22:25 +0200
commitcf0259f7662a84b20ac3a71b9e1cc9e918e9a244 (patch)
tree73113b62dd9e5bb546d7fc2bf461bf7946542eb8
parent04aa8a51e7230e9e84ddc6a52b9934394a47d31e (diff)
downloadlinux-yocto-cf0259f7662a84b20ac3a71b9e1cc9e918e9a244.tar.gz
linux-yocto-cf0259f7662a84b20ac3a71b9e1cc9e918e9a244.tar.bz2
linux-yocto-cf0259f7662a84b20ac3a71b9e1cc9e918e9a244.zip
securityfs: fix use-after-free on symlink traversal
[ Upstream commit 46c874419652bbefdfed17420fd6e88d8a31d9ec ] symlink body shouldn't be freed without an RCU delay. Switch securityfs to ->destroy_inode() and use of call_rcu(); free both the inode and symlink body in the callback. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--security/inode.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/security/inode.c b/security/inode.c
index b7772a9b315e..421dd72b5876 100644
--- a/security/inode.c
+++ b/security/inode.c
@@ -27,17 +27,22 @@
static struct vfsmount *mount;
static int mount_count;
-static void securityfs_evict_inode(struct inode *inode)
+static void securityfs_i_callback(struct rcu_head *head)
{
- truncate_inode_pages_final(&inode->i_data);
- clear_inode(inode);
+ struct inode *inode = container_of(head, struct inode, i_rcu);
if (S_ISLNK(inode->i_mode))
kfree(inode->i_link);
+ free_inode_nonrcu(inode);
+}
+
+static void securityfs_destroy_inode(struct inode *inode)
+{
+ call_rcu(&inode->i_rcu, securityfs_i_callback);
}
static const struct super_operations securityfs_super_operations = {
.statfs = simple_statfs,
- .evict_inode = securityfs_evict_inode,
+ .destroy_inode = securityfs_destroy_inode,
};
static int fill_super(struct super_block *sb, void *data, int silent)