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

Commit dc257279 authored by Ernesto A. Fernández's avatar Ernesto A. Fernández Committed by Linus Torvalds
Browse files

hfs: prevent crash on exit from failed search 

hfs_find_exit() expects fd->bnode to be NULL after a search has failed.
hfs_brec_insert() may instead set it to an error-valued pointer.  Fix
this to prevent a crash.

Link: http://lkml.kernel.org/r/53d9749a029c41b4016c495fc5838c9dba3afc52.1530294815.git.ernesto.mnd.fernandez@gmail.com


Signed-off-by: default avatarErnesto A. Fernández <ernesto.mnd.fernandez@gmail.com>
Cc: Anatoly Trosinenko <anatoly.trosinenko@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>
parent aba93a92

fs/hfs/brec.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -75,9 +75,10 @@ int hfs_brec_insert(struct hfs_find_data *fd, void *entry, int entry_len) 
	if (!fd->bnode) {

	if (!fd->bnode) {

		if (!tree->root)

		if (!tree->root)

			hfs_btree_inc_height(tree);

			hfs_btree_inc_height(tree);

		fd->bnode = hfs_bnode_find(tree, tree->leaf_head);

		node = hfs_bnode_find(tree, tree->leaf_head);

		if (IS_ERR(fd->bnode))

		if (IS_ERR(node))

			return PTR_ERR(fd->bnode);

			return PTR_ERR(node);

		fd->bnode = node;

		fd->record = -1;

		fd->record = -1;

	}

	}

	new_node = NULL;

	new_node = NULL;