From: Andrew Goodbody <andrew.goodbody@linaro.org>
Date: Tue, 8 Jul 2025 11:34:49 +0000 (+0100)
Subject: fs: btrfs: Do not free multi when guaranteed to be NULL
X-Git-Tag: v2025.10-rc1~64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9204cae0937c0e26fcff1ee08e51ef37f59844fe;p=thirdparty%2Fu-boot.git

fs: btrfs: Do not free multi when guaranteed to be NULL

multi is guaranteed to be NULL in the first two error exit paths so the
attempt to free it is not needed. Remove those calls.

This issue found by Smatch.

Signed-off-by: Andrew Goodbody <andrew.goodbody@linaro.org>
---

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 5726981b19c..71b0b55b9c6 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -972,12 +972,10 @@ int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw,
 again:
 	ce = search_cache_extent(&map_tree->cache_tree, logical);
 	if (!ce) {
-		kfree(multi);
 		*length = (u64)-1;
 		return -ENOENT;
 	}
 	if (ce->start > logical) {
-		kfree(multi);
 		*length = ce->start - logical;
 		return -ENOENT;
 	}