public inbox for linux-ext4@vger.kernel.org
 help / color / mirror / Atom feed
From: zhanchengbin <zhanchengbin1@huawei.com>
To: Theodore Ts'o <tytso@mit.edu>
Cc: <linux-ext4@vger.kernel.org>, <liuzhiqiang26@huawei.com>,
	<linfeilong@huawei.com>
Subject: [PATCH 4/6] e2fsprogs: call ext2fs_badblocks_list_free() to free list in exception branch
Date: Fri, 3 Dec 2021 14:29:46 +0800	[thread overview]
Message-ID: <861a4e77-66dc-2c0d-46b9-0af2666a988a@huawei.com> (raw)
In-Reply-To: <37c58382-9714-7e99-6c4d-01b78cfdbd26@huawei.com>

In the exception branch, not call ext2fs_badblocks_list_free() to
free list, it will cause memory leak.

Signed-off-by: zhanchengbin <zhanchengbin1@huawei.com>
Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
---
  misc/dumpe2fs.c    | 1 +
  resize/resize2fs.c | 4 ++--
  2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/misc/dumpe2fs.c b/misc/dumpe2fs.c
index 3f4fc4ed..ef6d1cb8 100644
--- a/misc/dumpe2fs.c
+++ b/misc/dumpe2fs.c
@@ -338,6 +338,7 @@ static void list_bad_blocks(ext2_filsys fs, int dump)
      if (retval) {
          com_err("ext2fs_badblocks_list_iterate_begin", retval,
              "%s", _("while printing bad block list"));
+        ext2fs_badblocks_list_free(bb_list);
          return;
      }
      if (dump) {
diff --git a/resize/resize2fs.c b/resize/resize2fs.c
index 73174be0..740cec48 100644
--- a/resize/resize2fs.c
+++ b/resize/resize2fs.c
@@ -1781,11 +1781,11 @@ static errcode_t block_mover(ext2_resize_t rfs)
                      fs->inode_blocks_per_group,
                      &rfs->itable_buf);
          if (retval)
-            return retval;
+            goto errout;
      }
      retval = ext2fs_create_extent_table(&rfs->bmap, 0);
      if (retval)
-        return retval;
+        goto errout;

      /*
       * The first step is to figure out where all of the blocks
-- 
2.23.0

  parent reply	other threads:[~2021-12-03  6:29 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-03  6:24 [PATCH 0/6] solve memory leak and check whether NULL pointer zhanchengbin
2021-12-03  6:26 ` [PATCH 1/6] e2fsck: set s->len=0 if malloc() fails in alloc_string() zhanchengbin
2021-12-03  6:31   ` Zhiqiang Liu
2021-12-03  6:27 ` [PATCH 2/6] lib/ss: check whether argp is null before accessing it in ss_execute_command() zhanchengbin
2021-12-03  6:28 ` [PATCH 3/6] lib/support: check whether inump is null before accessing it in quota_set_sb_inum() zhanchengbin
2021-12-03  6:29 ` zhanchengbin [this message]
2021-12-03  6:30 ` [PATCH 5/6] e2fsck: check whether ldesc is null before accessing it in end_problem_latch() zhanchengbin
2021-12-03  6:31 ` [PATCH 6/6] lib/ext2fs: call ext2fs_free_mem() to free &io->name in exception branch zhanchengbin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=861a4e77-66dc-2c0d-46b9-0af2666a988a@huawei.com \
    --to=zhanchengbin1@huawei.com \
    --cc=linfeilong@huawei.com \
    --cc=linux-ext4@vger.kernel.org \
    --cc=liuzhiqiang26@huawei.com \
    --cc=tytso@mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox