Skip to contentSkip to conversation

mtd: devices: phram.c: Fix multiple kfree statement from phram_setup

PATCH In review Saurav Girepunje 2 participants 2 messages Oct 28, 2019 – Oct 29, 2019

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

PATCH 1/1 mtd: devices: phram.c: Fix multiple kfree statement from phram_setup

Remove multiple kfree statement from phram_setup() in phram.c

---
 drivers/mtd/devices/phram.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/mtd/devices/phram.c +4 -4
index c467286ca007..38f95a1517ac 100644
@@ -243,22 +243,22 @@ static int phram_setup(const char *val)
 
 	ret = parse_num64(&start, token[1]);
 	if (ret) {
-		kfree(name);
 		parse_err("illegal start address\n");
+		goto free_nam;
 	}
 
 	ret = parse_num64(&len, token[2]);
 	if (ret) {
-		kfree(name);
 		parse_err("illegal device length\n");
+		goto free_nam;
 	}
 
 	ret = register_device(name, start, len);
 	if (!ret)
 		pr_info("%s device: %#llx at %#llx\n", name, len, start);
-	else
-		kfree(name);
 
+free_nam:
+	kfree(name);
 	return ret;
 }
 
Signature · 1 line
2.20.1
maintainer
#1 lore raw

Hi Saurav,

Saurav Girepunje <[email protected]> wrote on Mon, 28 Oct 2019 23:43:01 +0530:

Quoted 4 lines

Remove multiple kfree statement from phram_setup() in phram.c

---

Here you should add a changelog with the changes you have done since the last version.

Also when formatting the patch use -v <x> to add a version prefix into the title, like [PATCH v<x>].

Quoted 8 lines
 drivers/mtd/devices/phram.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/mtd/devices/phram.c +0 -0
index c467286ca007..38f95a1517ac 100644

drivers/mtd/devices/phram.c static int phram_setup(const char *val) · line 247

Quoted 6 lines
drivers/mtd/devices/phram.c +1 -1
@@ -243,22 +243,22 @@ static int phram_setup(const char *val)
 
 	ret = parse_num64(&start, token[1]);
 	if (ret) {
-		kfree(name);
 		parse_err("illegal start address\n");
+		goto free_nam;

s/nam/name

Quoted 10 lines
drivers/mtd/devices/phram.c +1 -1
 	}
 
 	ret = parse_num64(&len, token[2]);
 	if (ret) {
-		kfree(name);
 		parse_err("illegal device length\n");
+		goto free_nam;
 	}
 
 	ret = register_device(name, start, len);

drivers/mtd/devices/phram.c static int phram_setup(const char *val) · line 264

Quoted 10 lines
drivers/mtd/devices/phram.c +2 -2
 	if (!ret)
 		pr_info("%s device: %#llx at %#llx\n", name, len, start);
-	else
-		kfree(name);
 
+free_nam:
+	kfree(name);
 	return ret;
 }
 

Thanks,
Miquèl