* [PATCH] mtd: spi-nor: fix a memory leak bug
@ 2019-08-18 17:39 Wenwen Wang
2019-08-19 6:03 ` Tudor.Ambarus
0 siblings, 1 reply; 3+ messages in thread
From: Wenwen Wang @ 2019-08-18 17:39 UTC (permalink / raw)
To: Wenwen Wang
Cc: Marek Vasut, Tudor Ambarus, David Woodhouse, Brian Norris,
Miquel Raynal, Richard Weinberger, Vignesh Raghavendra,
open list:SPI NOR SUBSYSTEM, open list
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 <wenwen@cs.uga.edu>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] mtd: spi-nor: fix a memory leak bug
2019-08-18 17:39 [PATCH] mtd: spi-nor: fix a memory leak bug Wenwen Wang
@ 2019-08-19 6:03 ` Tudor.Ambarus
2019-08-19 17:03 ` Wenwen Wang
0 siblings, 1 reply; 3+ messages in thread
From: Tudor.Ambarus @ 2019-08-19 6:03 UTC (permalink / raw)
To: wenwen
Cc: marek.vasut, dwmw2, computersforpeace, miquel.raynal, richard,
vigneshr, linux-mtd, linux-kernel
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 <wenwen@cs.uga.edu>
> ---
> 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++)
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] mtd: spi-nor: fix a memory leak bug
2019-08-19 6:03 ` Tudor.Ambarus
@ 2019-08-19 17:03 ` Wenwen Wang
0 siblings, 0 replies; 3+ messages in thread
From: Wenwen Wang @ 2019-08-19 17:03 UTC (permalink / raw)
To: Tudor Ambarus
Cc: Marek Vasut, David Woodhouse, Brian Norris, Miquel Raynal,
Richard Weinberger, Vignesh Raghavendra,
open list:NAND FLASH SUBSYSTEM, open list, Wenwen Wang
On Mon, Aug 19, 2019 at 2:03 AM <Tudor.Ambarus@microchip.com> 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 <wenwen@cs.uga.edu>
> > ---
> > 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++)
> >
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-08-19 17:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-18 17:39 [PATCH] mtd: spi-nor: fix a memory leak bug Wenwen Wang
2019-08-19 6:03 ` Tudor.Ambarus
2019-08-19 17:03 ` Wenwen Wang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).