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: default avatarPan Bian <>
Reviewed-by: default avatarAndrew Morton <>
Cc: Ernesto A. Fernandez <>
Cc: Joe Perches <>
Cc: Viacheslav Dubeyko <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
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;
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);
return; return;
} }
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