Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 736ba5cb authored by Pan Bian's avatar Pan Bian Committed by Greg Kroah-Hartman
Browse files

hfs: do not free node before using 

[ Upstream commit ce96a407adef126870b3f4a1b73529dd8aa80f49 ]

hfs_bmap_free() frees the 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 the node only when
it is never again used.

Link: http://lkml.kernel.org/r/1542963889-128825-1-git-send-email-bianpan2016@163.com


Fixes: a1185ffa2fc ("HFS rewrite")
Signed-off-by: default avatarPan Bian <bianpan2016@163.com>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Joe Perches <joe@perches.com>
Cc: Ernesto A. Fernandez <ernesto.mnd.fernandez@gmail.com>
Cc: Viacheslav Dubeyko <slava@dubeyko.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 9549f09b

fs/hfs/btree.c

+2 −1
Original line number Diff line number Diff line
@@ -328,13 +328,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;