diff options
| author | Pan Bian | 2018-11-30 23:09:18 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-12-17 09:24:41 +0100 |
| commit | ab31765ef4dd68f4de5035a378016483688df4f2 (patch) | |
| tree | b2964243586c9d226ff2dac52a68d216ece810a4 /fs | |
| parent | hfs: do not free node before using (diff) | |
| download | kernel-qcow2-linux-ab31765ef4dd68f4de5035a378016483688df4f2.tar.gz kernel-qcow2-linux-ab31765ef4dd68f4de5035a378016483688df4f2.tar.xz kernel-qcow2-linux-ab31765ef4dd68f4de5035a378016483688df4f2.zip | |
hfsplus: do not free node before using
[ Upstream commit c7d7d620dcbd2a1c595092280ca943f2fced7bbd ]
hfs_bmap_free() frees 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 node only when it is
never used.
Link: http://lkml.kernel.org/r/1543053441-66942-1-git-send-email-bianpan2016@163.com
Signed-off-by: Pan Bian <bianpan2016@163.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Ernesto A. Fernandez <ernesto.mnd.fernandez@gmail.com>
Cc: Joe Perches <joe@perches.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')
| -rw-r--r-- | fs/hfsplus/btree.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/hfsplus/btree.c b/fs/hfsplus/btree.c index de14b2b6881b..3de3bc4918b5 100644 --- a/fs/hfsplus/btree.c +++ b/fs/hfsplus/btree.c @@ -454,14 +454,15 @@ 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; |