brain-hackers_pepepper-mirror
/
linux-brain
mirror of https://github.com/brain-hackers/linux-brain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.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>
This commit is contained in:
Pan Bian 2018-11-30 14:09:18 -08:00 committed by Linus Torvalds
parent ce96a407ad
commit c7d7d620dc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/hfsplus/btree.c
View File

@ -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;