diff options
author | Pan Bian <[email protected]> | 2018-11-30 14:09:18 -0800 |
---|---|---|
committer | Linus Torvalds <[email protected]> | 2018-11-30 14:56:14 -0800 |
commit | c7d7d620dcbd2a1c595092280ca943f2fced7bbd (patch) | |
tree | 2b1e9ff0c8d4ffeab24361d21b4d264c3f7264dc | |
parent | ce96a407adef126870b3f4a1b73529dd8aa80f49 (diff) |
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/[email protected]
Signed-off-by: Pan Bian <[email protected]>
Reviewed-by: Andrew Morton <[email protected]>
Cc: Ernesto A. Fernandez <[email protected]>
Cc: Joe Perches <[email protected]>
Cc: Viacheslav Dubeyko <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
-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 236efe51eca6..66774f4cb4fd 100644 --- a/fs/hfsplus/btree.c +++ b/fs/hfsplus/btree.c @@ -466,14 +466,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; |