mtd: nand: fix memory leak in ONFI extended parameter page

PATCH In review Brian Norris 2 participants 3 messages Sep 17, 2013 – Sep 19, 2013

Subsystems (2)

Memory technology devices (MTD) NAND flash

lore

Share & tools

lore

Brian Norris

author

2013-09-17 01:32 UTC #0 lore raw

PATCH 1/1 mtd: nand: fix memory leak in ONFI extended parameter page

This fixes a memory leak in the ONFI support code for detecting the required ECC levels from this commit:

commit 6dcbe0cdd83fb5f77be4f44c9e06c535281c375a
Author: Huang Shijie <[email protected]>
Date: Wed May 22 10:28:27 2013 +0800

mtd: get the ECC info from the Extended Parameter Page

In the success case, we never freed the 'ep' buffer.

Also, this fixes an oversight in the same commit where we (harmlessly) freed the NULL pointer.

Signed-off-by Brian Norris <[email protected]>

Cc Huang Shijie <[email protected]>

---
David, if there are no objections, can you send this to Linus for 3.12?

If this doesn't make it into 3.12, then it will be -stable material.

 drivers/mtd/nand/nand_base.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

drivers/mtd/nand/nand_base.c +3 -5

index d4578a1..00022b4 100644
@@ -2869,10 +2869,8 @@ static int nand_flash_detect_ext_param_page(struct mtd_info *mtd,
 
 	len = le16_to_cpu(p->ext_param_page_length) * 16;
 	ep = kmalloc(len, GFP_KERNEL);
-	if (!ep) {
-		ret = -ENOMEM;
-		goto ext_out;
-	}
+	if (!ep)
+		return -ENOMEM;
 
 	/* Send our own NAND_CMD_PARAM. */
 	chip->cmdfunc(mtd, NAND_CMD_PARAM, 0, -1);

@@ -2920,7 +2918,7 @@ static int nand_flash_detect_ext_param_page(struct mtd_info *mtd,
 	}
 
 	pr_info("ONFI extended param page detected.\n");
-	return 0;
+	ret = 0;
 
 ext_out:
 	kfree(ep);

Signature · 1 line

1.8.4

Huang Shijie

Acked-by on v1 1/1

2013-09-17 02:11 UTC #1 lore raw

Quoted 42 lines · Brian Norris

This fixes a memory leak in the ONFI support code for detecting the required ECC levels from this commit:
commit 6dcbe0cdd83fb5f77be4f44c9e06c535281c375a
Author: Huang Shijie <[email protected]>
Date: Wed May 22 10:28:27 2013 +0800
mtd: get the ECC info from the Extended Parameter Page
In the success case, we never freed the 'ep' buffer.
Also, this fixes an oversight in the same commit where we (harmlessly) freed the NULL pointer.
Signed-off-by Brian Norris <[email protected]>
Cc Huang Shijie <[email protected]>
---
David, if there are no objections, can you send this to Linus for 3.12?
If this doesn't make it into 3.12, then it will be -stable material.
 drivers/mtd/nand/nand_base.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/mtd/nand/nand_base.c +2 -4
index d4578a1..00022b4 100644
@@ -2869,10 +2869,8 @@ static int nand_flash_detect_ext_param_page(struct mtd_info *mtd,
 
 	len = le16_to_cpu(p->ext_param_page_length) * 16;
 	ep = kmalloc(len, GFP_KERNEL);
-	if (!ep) {
-		ret = -ENOMEM;
-		goto ext_out;
-	}
+	if (!ep)
+		return -ENOMEM;
 
 	/* Send our own NAND_CMD_PARAM. */
 	chip->cmdfunc(mtd, NAND_CMD_PARAM, 0, -1);

drivers/mtd/nand/nand_base.c static int nand_flash_detect_ext_param_page(struct mtd_info *mtd, · line 2924

Quoted 8 lines

drivers/mtd/nand/nand_base.c +1 -1

@@ -2920,7 +2918,7 @@ static int nand_flash_detect_ext_param_page(struct mtd_info *mtd,
 	}
 
 	pr_info("ONFI extended param page detected.\n");
-	return 0;
+	ret = 0;
 
 ext_out:
 	kfree(ep);

good catch!

Acked-by Huang Shijie <[email protected]>

Brian Norris

author

2013-09-19 04:15 UTC #2 lore raw

Quoted 49 lines · Huang Shijie

Quoted 48 lines · Brian Norris
This fixes a memory leak in the ONFI support code for detecting the required ECC levels from this commit:
commit 6dcbe0cdd83fb5f77be4f44c9e06c535281c375a
Author: Huang Shijie <[email protected]>
Date: Wed May 22 10:28:27 2013 +0800
mtd: get the ECC info from the Extended Parameter Page
In the success case, we never freed the 'ep' buffer.
Also, this fixes an oversight in the same commit where we (harmlessly) freed the NULL pointer.
Signed-off-by Brian Norris <[email protected]>
Cc Huang Shijie <[email protected]>
---
David, if there are no objections, can you send this to Linus for 3.12?
If this doesn't make it into 3.12, then it will be -stable material.
 drivers/mtd/nand/nand_base.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/mtd/nand/nand_base.c +3 -5
index d4578a1..00022b4 100644
@@ -2869,10 +2869,8 @@ static int nand_flash_detect_ext_param_page(struct mtd_info *mtd,
 
 	len = le16_to_cpu(p->ext_param_page_length) * 16;
 	ep = kmalloc(len, GFP_KERNEL);
-	if (!ep) {
-		ret = -ENOMEM;
-		goto ext_out;
-	}
+	if (!ep)
+		return -ENOMEM;
 
 	/* Send our own NAND_CMD_PARAM. */
 	chip->cmdfunc(mtd, NAND_CMD_PARAM, 0, -1);
@@ -2920,7 +2918,7 @@ static int nand_flash_detect_ext_param_page(struct mtd_info *mtd,
 	}
 
 	pr_info("ONFI extended param page detected.\n");
-	return 0;
+	ret = 0;
 

Quoted 5 lines

drivers/mtd/nand/nand_base.c static int nand_flash_detect_ext_param_page(struct mtd_info *mtd, · line 2924
Quoted 2 lines
drivers/mtd/nand/nand_base.c +0 -0
 ext_out:
 	kfree(ep);
good catch!
Acked-by Huang Shijie <[email protected]>

OK, pushed to l2-mtd.git. If I don't hear anything from David in a few days, then I'll see about sending it upstream myself. He had time to respond to your quad-SPI series but not to the pxa3xx compile failures in his -rc1 pull request.

Brian