Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Content-Type: text/plain;
        charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.20\))
Subject: Re: [PATCH 03/12] zap_sector: fix memory leak
From:   =?utf-8?B?0JHQu9Cw0LPQvtC00LDRgNC10L3QutC+INCQ0YDRgtGR0Lw=?= 
        <artem.blagodarenko@gmail.com>
In-Reply-To: <8ea5c607-54cc-ccaf-3e4b-ee2af0160a0b@huawei.com>
Date:   Mon, 24 May 2021 17:40:59 +0300
Cc:     linux-ext4@vger.kernel.org, liuzhiqiang26@huawei.com,
        linfeilong@huawei.com
Content-Transfer-Encoding: quoted-printable
Message-Id: <E51F98C9-49F5-45B2-9B2C-4FC309B5C8AB@gmail.com>
References: <266bc52e-e279-ce84-0e1f-1405b9bc6174@huawei.com>
 <8ea5c607-54cc-ccaf-3e4b-ee2af0160a0b@huawei.com>
To:     Wu Guanghao <wuguanghao3@huawei.com>
Precedence: bulk

Hello Wu,

Thank you for the fixes.

It looks like free and return operators should be placed in {} block.

{
	free(buf);
 	return;
}

Now function returns any time block is read successfully.

Also, this patch can not be applied cleanly to the master HEAD because =
of wrong offsets. Please rebase.

Best regards,
Artem Blagodarenko.

> On 24 May 2021, at 14:20, Wu Guanghao <wuguanghao3@huawei.com> wrote:
>=20
> In zap_sector(), need free buf before return,
> otherwise it will cause memory leak.
>=20
> Signed-off-by: Wu Guanghao <wuguanghao3@huawei.com>
> Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
> Reviewed-by: Wu Bo <wubo40@huawei.com>
> ---
> misc/mke2fs.c | 1 +
> 1 file changed, 1 insertion(+)
>=20
> diff --git a/misc/mke2fs.c b/misc/mke2fs.c
> index afbcf486..94f81da9 100644
> --- a/misc/mke2fs.c
> +++ b/misc/mke2fs.c
> @@ -586,6 +586,7 @@ static void zap_sector(ext2_filsys fs, int sect, =
int nsect)
> 			magic =3D (unsigned int *) (buf + =
BSD_LABEL_OFFSET);
> 			if ((*magic =3D=3D BSD_DISKMAGIC) ||
> 				(*magic =3D=3D BSD_MAGICDISK))
> +				free(buf);
> 				return;
> 		}
> 	}
> --=20