diff options
| author | Pan Bian <bianpan2016@163.com> | 2018-11-30 14:09:14 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-17 09:38:35 +0100 |
| commit | 5cf41549e60a458b72295715de6f3ed5b9216361 (patch) | |
| tree | e438e5d4e8248ccd3e697f05f62af444fd6e218b /fs/hfs | |
| parent | 12daef1de3584e4dd1f6785202dbb441afb48bf8 (diff) | |
| download | linux-stable-5cf41549e60a458b72295715de6f3ed5b9216361.tar.gz linux-stable-5cf41549e60a458b72295715de6f3ed5b9216361.tar.bz2 linux-stable-5cf41549e60a458b72295715de6f3ed5b9216361.zip | |
hfs: do not free node before using
[ Upstream commit ce96a407adef126870b3f4a1b73529dd8aa80f49 ]
hfs_bmap_free() frees the node via hfs_bnode_put(node). However, it
then reads node->this when dumping error message on an error path, which
may result in a use-after-free bug. This patch frees the node only when
it is never again used.
Link: http://lkml.kernel.org/r/1542963889-128825-1-git-send-email-bianpan2016@163.com
Fixes: a1185ffa2fc ("HFS rewrite")
Signed-off-by: Pan Bian <bianpan2016@163.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Joe Perches <joe@perches.com>
Cc: Ernesto A. Fernandez <ernesto.mnd.fernandez@gmail.com>
Cc: Viacheslav Dubeyko <slava@dubeyko.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs/hfs')
| -rw-r--r-- | fs/hfs/btree.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/hfs/btree.c b/fs/hfs/btree.c index 37cdd955eceb..320f4372f172 100644 --- a/fs/hfs/btree.c +++ b/fs/hfs/btree.c @@ -328,13 +328,14 @@ void hfs_bmap_free(struct hfs_bnode *node) nidx -= len * 8; i = node->next; - hfs_bnode_put(node); if (!i) { /* panic */; pr_crit("unable to free bnode %u. bmap not found!\n", node->this); + hfs_bnode_put(node); return; } + hfs_bnode_put(node); node = hfs_bnode_find(tree, i); if (IS_ERR(node)) return; |