2019-08-18 17:41:11

by Wenwen Wang

Subject: [PATCH] mtd: spi-nor: fix a memory leak bug

In spi_nor_parse_4bait(), 'dwords' is allocated through kmalloc(). However,
it is not deallocated in the following execution if spi_nor_read_sfdp()
fails, leading to a memory leak. To fix this issue, free 'dwords' before
returning the error.

Signed-off-by: Wenwen Wang <[email protected]>
---
drivers/mtd/spi-nor/spi-nor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index 03cc788..a41a466 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -3453,7 +3453,7 @@ static int spi_nor_parse_4bait(struct spi_nor *nor,
addr = SFDP_PARAM_HEADER_PTP(param_header);
ret = spi_nor_read_sfdp(nor, addr, len, dwords);
if (ret)
- return ret;
+ goto out;

/* Fix endianness of the 4BAIT DWORDs. */
for (i = 0; i < SFDP_4BAIT_DWORD_MAX; i++)
--
2.7.4

2019-08-19 06:05:02

by Tudor Ambarus

Subject: Re: [PATCH] mtd: spi-nor: fix a memory leak bug

On 08/18/2019 08:39 PM, Wenwen Wang wrote:
> In spi_nor_parse_4bait(), 'dwords' is allocated through kmalloc(). However,
> it is not deallocated in the following execution if spi_nor_read_sfdp()
> fails, leading to a memory leak. To fix this issue, free 'dwords' before
> returning the error.

Looks good. Would you add a Fixes tag?
>
> Signed-off-by: Wenwen Wang <[email protected]>
> ---
> drivers/mtd/spi-nor/spi-nor.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
> index 03cc788..a41a466 100644
> --- a/drivers/mtd/spi-nor/spi-nor.c
> +++ b/drivers/mtd/spi-nor/spi-nor.c
> @@ -3453,7 +3453,7 @@ static int spi_nor_parse_4bait(struct spi_nor *nor,
> addr = SFDP_PARAM_HEADER_PTP(param_header);
> ret = spi_nor_read_sfdp(nor, addr, len, dwords);
> if (ret)
> - return ret;
> + goto out;
>
> /* Fix endianness of the 4BAIT DWORDs. */
> for (i = 0; i < SFDP_4BAIT_DWORD_MAX; i++)
>

2019-08-19 17:05:40

by Wenwen Wang

Subject: Re: [PATCH] mtd: spi-nor: fix a memory leak bug

On Mon, Aug 19, 2019 at 2:03 AM <[email protected]> wrote:
>
>
>
> On 08/18/2019 08:39 PM, Wenwen Wang wrote:
> > In spi_nor_parse_4bait(), 'dwords' is allocated through kmalloc(). However,
> > it is not deallocated in the following execution if spi_nor_read_sfdp()
> > fails, leading to a memory leak. To fix this issue, free 'dwords' before
> > returning the error.
>
> Looks good. Would you add a Fixes tag?

Sure, I will add the Fixes tag and resubmit the patch. Thanks!

Wenwen

> >
> > Signed-off-by: Wenwen Wang <[email protected]>
> > ---
> > drivers/mtd/spi-nor/spi-nor.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
> > index 03cc788..a41a466 100644
> > --- a/drivers/mtd/spi-nor/spi-nor.c
> > +++ b/drivers/mtd/spi-nor/spi-nor.c
> > @@ -3453,7 +3453,7 @@ static int spi_nor_parse_4bait(struct spi_nor *nor,
> > addr = SFDP_PARAM_HEADER_PTP(param_header);
> > ret = spi_nor_read_sfdp(nor, addr, len, dwords);
> > if (ret)
> > - return ret;
> > + goto out;
> >
> > /* Fix endianness of the 4BAIT DWORDs. */
> > for (i = 0; i < SFDP_4BAIT_DWORD_MAX; i++)
> >