Commit c7d7d620 authored by Pan Bian's avatar Pan Bian Committed by Linus Torvalds

hfsplus: do not free node before using

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.comSigned-off-by: default avatarPan Bian <bianpan2016@163.com>
Reviewed-by: default avatarAndrew 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ce96a407
...@@ -466,14 +466,15 @@ void hfs_bmap_free(struct hfs_bnode *node) ...@@ -466,14 +466,15 @@ void hfs_bmap_free(struct hfs_bnode *node)
nidx -= len * 8; nidx -= len * 8;
i = node->next; i = node->next;
hfs_bnode_put(node);
if (!i) { if (!i) {
/* panic */; /* panic */;
pr_crit("unable to free bnode %u. " pr_crit("unable to free bnode %u. "
"bmap not found!\n", "bmap not found!\n",
node->this); node->this);
hfs_bnode_put(node);
return; return;
} }
hfs_bnode_put(node);
node = hfs_bnode_find(tree, i); node = hfs_bnode_find(tree, i);
if (IS_ERR(node)) if (IS_ERR(node))
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment