Re: [PATCH] hfs: do not free node before using

[Viacheslav Dubeyko]

On Fri, 2018-11-23 at 17:04 +0800, Pan Bian wrote:
> 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.
> 
> Fixes: d614267329f("hfs/hfsplus: convert printks to pr_<level>")
> 
> Signed-off-by: Pan Bian <bianpan2016@xxxxxxx>
> ---
> Âfs/hfs/btree.c | 3 ++-
> Â1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/hfs/btree.c b/fs/hfs/btree.c
> index 98b96ff..19017d2 100644
> --- a/fs/hfs/btree.c
> +++ b/fs/hfs/btree.c
> @@ -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);


What's about simply to store node->this into the local variable in the
beginning of the cycle? In this case, it is possible to use the node ID
in the pr_crit() and to use the hfs_bnode_put(node) in the same place
without to use it twice. What do you think?

Thanks,
Vyacheslav Dubeyko.


> +			hfs_bnode_put(node);
> Â			return;
> Â		}
> +		hfs_bnode_put(node);
> Â		node = hfs_bnode_find(tree, i);
> Â		if (IS_ERR(node))
> Â			return;