diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2019-03-26 01:39:50 +0000 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-16 09:17:19 +0200 |
commit | 44a476cf0bc2209c3c91ad9815cccc4a5ea2ca72 (patch) | |
tree | ea8dd51caf2d0c069df3526428c6e2c7e9eecfe9 | |
parent | c452e33d4940eda5f7f9e173cbc9356de6aedc66 (diff) | |
download | linux-stable-44a476cf0bc2209c3c91ad9815cccc4a5ea2ca72.tar.gz linux-stable-44a476cf0bc2209c3c91ad9815cccc4a5ea2ca72.tar.bz2 linux-stable-44a476cf0bc2209c3c91ad9815cccc4a5ea2ca72.zip |
jffs2: fix use-after-free on symlink traversal
[ Upstream commit 4fdcfab5b5537c21891e22e65996d4d0dd8ab4ca ]
free the symlink body after the same RCU delay we have for freeing the
struct inode itself, so that traversal during RCU pathwalk wouldn't step
into freed memory.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r-- | fs/jffs2/readinode.c | 5 | ||||
-rw-r--r-- | fs/jffs2/super.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/fs/jffs2/readinode.c b/fs/jffs2/readinode.c index 386303dca382..4f390be71723 100644 --- a/fs/jffs2/readinode.c +++ b/fs/jffs2/readinode.c @@ -1429,11 +1429,6 @@ void jffs2_do_clear_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f) jffs2_kill_fragtree(&f->fragtree, deleted?c:NULL); - if (f->target) { - kfree(f->target); - f->target = NULL; - } - fds = f->dents; while(fds) { fd = fds; diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c index 0bbc31d10857..d1be5991bb66 100644 --- a/fs/jffs2/super.c +++ b/fs/jffs2/super.c @@ -47,7 +47,10 @@ static struct inode *jffs2_alloc_inode(struct super_block *sb) static void jffs2_i_callback(struct rcu_head *head) { struct inode *inode = container_of(head, struct inode, i_rcu); - kmem_cache_free(jffs2_inode_cachep, JFFS2_INODE_INFO(inode)); + struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode); + + kfree(f->target); + kmem_cache_free(jffs2_inode_cachep, f); } static void jffs2_destroy_inode(struct inode *inode) |