From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Mon, 9 Jun 2025 21:30:40 +0000 (-0400)
Subject: bcachefs: Fix leak in bch2_fs_recovery() error path
X-Git-Tag: v6.16-rc2~18^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9e48f574e55731106b26dc33d8b0be1adedf3f20;p=thirdparty%2Flinux.git

bcachefs: Fix leak in bch2_fs_recovery() error path

Fix a small leak of the superblock 'clean' section.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c
index 520eb72c4971..0b21fa6ff062 100644
--- a/fs/bcachefs/recovery.c
+++ b/fs/bcachefs/recovery.c
@@ -1108,9 +1108,6 @@ use_clean:
 out:
 	bch2_flush_fsck_errs(c);
 
-	if (!IS_ERR(clean))
-		kfree(clean);
-
 	if (!ret &&
 	    test_bit(BCH_FS_need_delete_dead_snapshots, &c->flags) &&
 	    !c->opts.nochanges) {
@@ -1119,6 +1116,9 @@ out:
 	}
 
 	bch_err_fn(c, ret);
+final_out:
+	if (!IS_ERR(clean))
+		kfree(clean);
 	return ret;
 err:
 fsck_err:
@@ -1132,7 +1132,7 @@ fsck_err:
 		bch2_print_str(c, KERN_ERR, buf.buf);
 		printbuf_exit(&buf);
 	}
-	return ret;
+	goto final_out;
 }
 
 int bch2_fs_initialize(struct bch_fs *c)