Skip to contentSkip to conversation

mtd: onenand: prevent memory leak in onenand_scan

PATCH Superseded Navid Emamdoost 3 participants 8 messages Sep 25, 2019 – Oct 7, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mtd: onenand: prevent memory leak in onenand_scan

In onenand_scan if scan_bbt fails the allocated buffers should be released.

---
 drivers/mtd/nand/onenand/onenand_base.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/mtd/nand/onenand/onenand_base.c +4 -1
index 77bd32a683e1..79c01f42925a 100644
@@ -3977,8 +3977,11 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
 	this->badblockpos = ONENAND_BADBLOCK_POS;
 
 	ret = this->scan_bbt(mtd);
-	if ((!FLEXONENAND(this)) || ret)
+	if ((!FLEXONENAND(this)) || ret) {
+		kfree(this->page_buf);
+		kfree(this->oob_buf);
 		return ret;
+	}
 
 	/* Change Flex-OneNAND boundaries if required */
 	for (i = 0; i < MAX_DIES; i++)
Signature · 1 line
2.17.1
#1 lore raw
Quoted 1 line

In onenand_scan if scan_bbt fails the allocated buffers should be released.

Will an other change description be more appropriate?

How do you think about to add the tag “Fixes” here?

Regards,
Markus

#2 lore raw
In reply to Navid Emamdoost

Would you please take a look at this patch?

Quoted 29 lines · Navid Emamdoost

In onenand_scan if scan_bbt fails the allocated buffers should be released.

---
 drivers/mtd/nand/onenand/onenand_base.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/mtd/nand/onenand/onenand_base.c +4 -2
index 77bd32a683e1..79c01f42925a 100644
@@ -3977,8 +3977,11 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
        this->badblockpos = ONENAND_BADBLOCK_POS;
 
        ret = this->scan_bbt(mtd);
-       if ((!FLEXONENAND(this)) || ret)
+       if ((!FLEXONENAND(this)) || ret) {
+               kfree(this->page_buf);
+               kfree(this->oob_buf);
                return ret;
+       }
 
        /* Change Flex-OneNAND boundaries if required */
        for (i = 0; i < MAX_DIES; i++)
--

2.17.1

Signature · 1 line
Navid.
maintainer
#3 lore raw

Hi Navid,

Navid Emamdoost <[email protected]> wrote on Mon, 30 Sep 2019 16:37:17 -0500:

Quoted 20 lines

Would you please take a look at this patch?

Quoted 16 lines · Navid Emamdoost

In onenand_scan if scan_bbt fails the allocated buffers should be released.

---
 drivers/mtd/nand/onenand/onenand_base.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/mtd/nand/onenand/onenand_base.c +0 -0
index 77bd32a683e1..79c01f42925a 100644
@@ -3977,8 +3977,11 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
        this->badblockpos = ONENAND_BADBLOCK_POS;
 
Quoted 4 lines

drivers/mtd/nand/onenand/onenand_base.c int onenand_scan(struct mtd_info *mtd, int maxchips) · line 3981

Quoted 4 lines
drivers/mtd/nand/onenand/onenand_base.c +2 -1
        ret = this->scan_bbt(mtd);
-       if ((!FLEXONENAND(this)) || ret)
+       if ((!FLEXONENAND(this)) || ret) {
+               kfree(this->page_buf);

Apparently you missed:

#ifdef CONFIG_MTD_ONENAND_VERIFY_WRITE
        kfree(this->verify_buf);

#endif

Quoted 11 lines
Quoted 9 lines
drivers/mtd/nand/onenand/onenand_base.c +2 -1
+               kfree(this->oob_buf);
                return ret;
+       }
 
        /* Change Flex-OneNAND boundaries if required */
        for (i = 0; i < MAX_DIES; i++)
--

2.17.1

Thanks,
Miquèl

#4 lore raw

PATCH v2 1/1 mtd: onenand: prevent memory leak in onenand_scan

In onenand_scan if scan_bbt fails the allocated buffers for oob_buf, verify_buf, and page_buf should be released.

Fixes 5988af231978 ("mtd: Flex-OneNAND support")

---
Changes in v2:

	-- added release for this->verify_buf (thanks to Miquel Raynal
for the hint).
---
 drivers/mtd/nand/onenand/onenand_base.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/mtd/nand/onenand/onenand_base.c +7 -1
index 77bd32a683e1..6329ada3f15c 100644
@@ -3977,8 +3977,14 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
 	this->badblockpos = ONENAND_BADBLOCK_POS;
 
 	ret = this->scan_bbt(mtd);
-	if ((!FLEXONENAND(this)) || ret)
+	if ((!FLEXONENAND(this)) || ret) {
+		kfree(this->oob_buf);
+#ifdef CONFIG_MTD_ONENAND_VERIFY_WRITE
+		kfree(this->verify_buf);
+#endif
+		kfree(this->page_buf);
 		return ret;
+	}
 
 	/* Change Flex-OneNAND boundaries if required */
 	for (i = 0; i < MAX_DIES; i++)
Signature · 1 line
2.17.1
#5 lore raw
Quoted 2 lines

In onenand_scan if scan_bbt fails the allocated buffers for oob_buf, verify_buf, and page_buf should be released.

Can a wording like the following be nicer for the change description?

Release the memory for the buffers “oob_buf”, “verify_buf” and “page_buf” after a call of the function “scan_bbt” failed in the implementation of the function “onenand_scan”.

Quoted 1 line
Fixes 5988af231978 ("mtd: Flex-OneNAND support")

…

Quoted 2 lines

---
Changes in v2:

…

Quoted 1 line

for the hint).

Did you take another review comment into account for this patch change log?

Quoted 1 line

---

Please replace the delimiter at this place by a blank line in subsequent messages.

Quoted 1 line
 drivers/mtd/nand/onenand/onenand_base.c | 8 +++++++-

…

Regards,
Markus

maintainer
#6 lore raw
In reply to Navid Emamdoost

Hi Navid,

Navid Emamdoost <[email protected]> wrote on Fri, 4 Oct 2019 12:19:05 -0500:

Quoted 4 lines

In onenand_scan if scan_bbt fails the allocated buffers for oob_buf, verify_buf, and page_buf should be released.

Fixes 5988af231978 ("mtd: Flex-OneNAND support")

Missing Cc: [email protected]

Quoted 6 lines

---
Changes in v2:

	-- added release for this->verify_buf (thanks to Miquel Raynal

for the hint).
---

These three dashes are not needed.

Quoted 8 lines
 drivers/mtd/nand/onenand/onenand_base.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/mtd/nand/onenand/onenand_base.c +0 -0
index 77bd32a683e1..6329ada3f15c 100644

drivers/mtd/nand/onenand/onenand_base.c int onenand_scan(struct mtd_info *mtd, int maxchips) · line 3984

Quoted 9 lines
drivers/mtd/nand/onenand/onenand_base.c +5 -1
@@ -3977,8 +3977,14 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
 	this->badblockpos = ONENAND_BADBLOCK_POS;
 
 	ret = this->scan_bbt(mtd);
-	if ((!FLEXONENAND(this)) || ret)
+	if ((!FLEXONENAND(this)) || ret) {
+		kfree(this->oob_buf);
+#ifdef CONFIG_MTD_ONENAND_VERIFY_WRITE
+		kfree(this->verify_buf);
+#endif

Sorry for the ping-pong but actually, only the oob_buf and page_buf have been introduced by the commit 5988af you point in the Fixes tag.

To help stable kernels maintainers I suggest you free the verify_buf in a second patch which fixes:

4a8ce0b03071 mtd: onenand: allocate verify buffer in the core

drivers/mtd/nand/onenand/onenand_base.c int onenand_scan(struct mtd_info *mtd, int maxchips) · line 3990

Quoted 6 lines
drivers/mtd/nand/onenand/onenand_base.c +2 -0
+		kfree(this->page_buf);
 		return ret;
+	}
 
 	/* Change Flex-OneNAND boundaries if required */
 	for (i = 0; i < MAX_DIES; i++)

Thanks,
Miquèl

#7 lore raw
In reply to Miquel Raynal

Thanks Miquel for pointing that out. v2 was sent.

Thank you,
Navid.

Quoted 51 lines · Miquel Raynal

Hi Navid,

Navid Emamdoost <[email protected]> wrote on Mon, 30 Sep 2019 16:37:17 -0500:

Quoted 20 lines

Would you please take a look at this patch?

Quoted 16 lines · Navid Emamdoost

In onenand_scan if scan_bbt fails the allocated buffers should be released.

---
 drivers/mtd/nand/onenand/onenand_base.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/mtd/nand/onenand/onenand_base.c +0 -0
index 77bd32a683e1..79c01f42925a 100644
@@ -3977,8 +3977,11 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
        this->badblockpos = ONENAND_BADBLOCK_POS;
 
Quoted 4 lines

drivers/mtd/nand/onenand/onenand_base.c int onenand_scan(struct mtd_info *mtd, int maxchips) · line 3981

Quoted 4 lines
drivers/mtd/nand/onenand/onenand_base.c +2 -1
        ret = this->scan_bbt(mtd);
-       if ((!FLEXONENAND(this)) || ret)
+       if ((!FLEXONENAND(this)) || ret) {
+               kfree(this->page_buf);

Apparently you missed:

#ifdef CONFIG_MTD_ONENAND_VERIFY_WRITE
        kfree(this->verify_buf);

#endif

Quoted 11 lines
Quoted 9 lines
drivers/mtd/nand/onenand/onenand_base.c +2 -1
+               kfree(this->oob_buf);
                return ret;
+       }
 
        /* Change Flex-OneNAND boundaries if required */
        for (i = 0; i < MAX_DIES; i++)
--

2.17.1

Thanks,
Miquèl

Signature · 1 line
Navid.