hfs: do not free node before using
Subsystems (2)
PATCH v2 1/1 hfs: do not free node before using
The function 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.
---
V2: correct the commit information in Fixes
--- fs/hfs/btree.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/hfs/btree.c +2 -1
@@ -338,13 +338,14 @@ 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 ;
Signature · 1 line
2.7.4
Viacheslav Dubeyko
maintainerQuoted 6 lines · Pan Bian
The function
hfs_bmap_freefrees node viahfs_bnode_put(node). However,
it then readsnode->thiswhen 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.
Quoted 6 lines
Fixes a1185ffa2fc("HFS rewrite")Signed-off-by Pan Bian <[email protected]>---
V2: correct the commit information in Fixes
By the way, HFS+ has the same issue [1].
Quoted 22 lines
---
fs/hfs/btree.c | 3 ++-1 file changed, 2 insertions(+), 1 deletion(-)fs/hfs/btree.c +0
-0@@ -338,13 +338,14 @@ void hfs_bmap_free(struct hfs_bnode *node)
nidx -= len * 8;
i =node->next;fs/hfs/btree.c +0
-1-hfs_bnode_put (node);if (!i) {
/* panic */;
pr_crit("unable to free bnode %u. bmap not found!\n",
node->this);fs/hfs/btree.c +1
-0+hfs_bnode_put (node);return;
}
fs/hfs/btree.c
Quoted 1 line
fs/hfs/btree.c +1
-0+hfs_bnode_put (node);
First of all, it looks weird to have two calls of hfs_bnode_put(node). Secondly, you will add only one line of code instead of two if you simply save the node->this in the local variable.
Quoted 3 lines
node =
hfs_bnode_find(tree, i);
if (IS_ERR(node))
return;
Thanks,
Vyacheslav Dubeyko.
[1] https://elixir.bootlin.com/linux/latest/source/fs/hfsplus/btree.c#L457