btrfs : fix memory leak in add_block_entry
diff mbox series

Message ID 20200707132908.10987-1-trix@redhat.com
State New
Headers show
Series
  • btrfs : fix memory leak in add_block_entry
Related show

Commit Message

Tom Rix July 7, 2020, 1:29 p.m. UTC
From: Tom Rix <trix@redhat.com>

clang static analysis flags this error

fs/btrfs/ref-verify.c:290:3: warning: Potential leak of memory pointed to by 're' [unix.Malloc]
                kfree(be);
                ^~~~~
The problem is in this block of code

		if (root_objectid) {
			struct root_entry *exist_re;

			exist_re = insert_root_entry(&exist->roots, re);
			if (exist_re)
				kfree(re);
		}

There is no 'else' block freeing when root_objectid == 0

So add an 'else'

Fixes: fd708b81d972 ("Btrfs: add a extent ref verify tool")

Signed-off-by: Tom Rix <trix@redhat.com>
---
 fs/btrfs/ref-verify.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

David Sterba July 14, 2020, 2:10 p.m. UTC | #1
On Tue, Jul 07, 2020 at 06:29:08AM -0700, trix@redhat.com wrote:
> From: Tom Rix <trix@redhat.com>
> 
> clang static analysis flags this error
> 
> fs/btrfs/ref-verify.c:290:3: warning: Potential leak of memory pointed to by 're' [unix.Malloc]
>                 kfree(be);
>                 ^~~~~
> The problem is in this block of code
> 
> 		if (root_objectid) {
> 			struct root_entry *exist_re;
> 
> 			exist_re = insert_root_entry(&exist->roots, re);
> 			if (exist_re)
> 				kfree(re);
> 		}
> 
> There is no 'else' block freeing when root_objectid == 0
> 
> So add an 'else'
> 
> Fixes: fd708b81d972 ("Btrfs: add a extent ref verify tool")
> 
> Signed-off-by: Tom Rix <trix@redhat.com>

Added to misc-next, thanks.

Patch
diff mbox series

diff --git a/fs/btrfs/ref-verify.c b/fs/btrfs/ref-verify.c
index af92525dbb16..7f03dbe5b609 100644
--- a/fs/btrfs/ref-verify.c
+++ b/fs/btrfs/ref-verify.c
@@ -286,6 +286,8 @@  static struct block_entry *add_block_entry(struct btrfs_fs_info *fs_info,
 			exist_re = insert_root_entry(&exist->roots, re);
 			if (exist_re)
 				kfree(re);
+		} else {
+			kfree(re);
 		}
 		kfree(be);
 		return exist;