Re: [PATCH v2 1/3] hfs: add missing clean-up in hfs_fill_super

From
Viacheslav Dubeyko <slava@dubeyko.com>
Date
2021-07-01 17:03:54
Also in
linux-fsdevel, linux-kernel-mentees
Reply to
Desmond Cheong Zhi Xi, 2021-07-01
quoted hunk ↗ jump to hunk
On Jun 30, 2021, at 8:07 PM, Desmond Cheong Zhi Xi [off-list ref] wrote:

Before exiting hfs_fill_super, the struct hfs_find_data used in
hfs_find_init should be passed to hfs_find_exit to be cleaned up, and
to release the lock held on the btree.

The call to hfs_find_exit is missing from an error path. We add it
back in by consolidating calls to hfs_find_exit for error paths.

Signed-off-by: Desmond Cheong Zhi Xi <redacted>
---
fs/hfs/super.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/fs/hfs/super.c b/fs/hfs/super.c
index 44d07c9e3a7f..12d9bae39363 100644
--- a/fs/hfs/super.c
+++ b/fs/hfs/super.c
@@ -420,14 +420,12 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent)
	if (!res) {
		if (fd.entrylength > sizeof(rec) || fd.entrylength < 0) {
			res =  -EIO;
-			goto bail;
+			goto bail_hfs_find;
		}
		hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, fd.entrylength);
	}
-	if (res) {
-		hfs_find_exit(&fd);
-		goto bail_no_root;
-	}
+	if (res)
+		goto bail_hfs_find;
	res = -EINVAL;
	root_inode = hfs_iget(sb, &fd.search_key->cat, &rec);
	hfs_find_exit(&fd);
@@ -443,6 +441,8 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent)
	/* everything's okay */
	return 0;

+bail_hfs_find:
+	hfs_find_exit(&fd);
bail_no_root:
	pr_err("get root inode failed\n");
bail:
-- 
2.25.1
Looks good.

Reviewed-by: Viacheslav Dubeyko <slava@dubeyko.com>

Thanks,
Slava.
Thread (8 messages) 8 messages, 2 authors, last reply 2021-07-01
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help