linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] hfsplus: prevent crash on exit from failed search
@ 2018-06-29 18:34 Ernesto A. Fernández
  2018-06-29 18:37 ` [PATCH 2/2] hfs: " Ernesto A. Fernández
  2018-07-02 18:01 ` [PATCH 1/2] hfsplus: " Viacheslav Dubeyko
  0 siblings, 2 replies; 6+ messages in thread
From: Ernesto A. Fernández @ 2018-06-29 18:34 UTC (permalink / raw)
  To: linux-fsdevel; +Cc: Andrew Morton, Anatoly Trosinenko

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

Reported-by: Anatoly Trosinenko <anatoly.trosinenko@gmail.com>
Signed-off-by: Ernesto A. Fernández <ernesto.mnd.fernandez@gmail.com>
---
 fs/hfsplus/brec.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fs/hfsplus/brec.c b/fs/hfsplus/brec.c
index 808f4d8c859c..ed8eacb34452 100644
--- a/fs/hfsplus/brec.c
+++ b/fs/hfsplus/brec.c
@@ -73,9 +73,10 @@ int hfs_brec_insert(struct hfs_find_data *fd, void *entry, int entry_len)
 	if (!fd->bnode) {
 		if (!tree->root)
 			hfs_btree_inc_height(tree);
-		fd->bnode = hfs_bnode_find(tree, tree->leaf_head);
-		if (IS_ERR(fd->bnode))
-			return PTR_ERR(fd->bnode);
+		node = hfs_bnode_find(tree, tree->leaf_head);
+		if (IS_ERR(node))
+			return PTR_ERR(node);
+		fd->bnode = node;
 		fd->record = -1;
 	}
 	new_node = NULL;
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2018-08-22 23:54 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-29 18:34 [PATCH 1/2] hfsplus: prevent crash on exit from failed search Ernesto A. Fernández
2018-06-29 18:37 ` [PATCH 2/2] hfs: " Ernesto A. Fernández
2018-07-02 18:01 ` [PATCH 1/2] hfsplus: " Viacheslav Dubeyko
2018-08-21 23:02   ` Andrew Morton
2018-08-22 18:11     ` Ernesto A. Fernández
2018-08-22 20:27       ` Viacheslav Dubeyko

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).