Skip to contentSkip to conversation

bus: fsl-mc: fix invalid free in fsl_mc_device_add

PATCH Superseded [email protected] 2 participants 2 messages Jul 9, 2020 QorIQ DPAA2 fsl-mc bus driver

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 bus: fsl-mc: fix invalid free in fsl_mc_device_add

From: Tom Rix <[email protected]>

clang static analysis flags this error

fsl-mc-bus.c:695:2: warning: Attempt to free released memory [unix.Malloc]

        kfree(mc_dev);
        ^~~~~~~~~~~~~

The problem block of code is

		mc_bus = kzalloc(sizeof(*mc_bus), GFP_KERNEL);
		if (!mc_bus)
			return -ENOMEM;

		mc_dev = &mc_bus->mc_dev;

mc_bus's structure contains a mc_dev element,
freeing it later is not appropriate.

So check if mc_bus was allocated before freeing mc_dev

This is a case where checkpatch

WARNING: kfree(NULL) is safe and this check is probably not required
+ if (mc_bus)
+ kfree(mc_bus);

is wrong.

Fixes a042fbed0290 ("staging: fsl-mc: simplify couple of deallocations")

---
v1: add a comment to explain freeing uniqueness

 drivers/bus/fsl-mc/fsl-mc-bus.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/bus/fsl-mc/fsl-mc-bus.c +8 -2
index 40526da5c6a6..df10ed430baa 100644
@@ -691,8 +691,14 @@ int fsl_mc_device_add(struct fsl_mc_obj_desc *obj_desc,
 
 error_cleanup_dev:
 	kfree(mc_dev->regions);
-	kfree(mc_bus);
-	kfree(mc_dev);
+	/*
+	 * mc_bus allocates a private version of mc_dev
+	 * it is not appropriate to free the private version.
+	 */
+	if (mc_bus)
+		kfree(mc_bus);
+	else
+		kfree(mc_dev);
 
 	return error;
 }
Signature · 1 line
2.18.1
#1 lore raw
Quoted 43 lines · On Thu, Jul 09, 2020 at 05:41:15AM -0700, [email protected] wrote:

From: Tom Rix <[email protected]>

clang static analysis flags this error

fsl-mc-bus.c:695:2: warning: Attempt to free released memory [unix.Malloc]

        kfree(mc_dev);
        ^~~~~~~~~~~~~

The problem block of code is

		mc_bus = kzalloc(sizeof(*mc_bus), GFP_KERNEL);
		if (!mc_bus)
			return -ENOMEM;

		mc_dev = &mc_bus->mc_dev;

mc_bus's structure contains a mc_dev element,
freeing it later is not appropriate.

So check if mc_bus was allocated before freeing mc_dev

This is a case where checkpatch

WARNING: kfree(NULL) is safe and this check is probably not required

drivers/bus/fsl-mc/fsl-mc-bus.c +2 -0
+	if (mc_bus)
+		kfree(mc_bus);

is wrong.

Fixes a042fbed0290 ("staging: fsl-mc: simplify couple of deallocations")

---
v1: add a comment to explain freeing uniqueness

 drivers/bus/fsl-mc/fsl-mc-bus.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/bus/fsl-mc/fsl-mc-bus.c +0 -0
index 40526da5c6a6..df10ed430baa 100644

drivers/bus/fsl-mc/fsl-mc-bus.c int fsl_mc_device_add(struct fsl_mc_obj_desc *obj_desc, · line 695

Quoted 5 lines
drivers/bus/fsl-mc/fsl-mc-bus.c +0 -2
@@ -691,8 +691,14 @@ int fsl_mc_device_add(struct fsl_mc_obj_desc *obj_desc,
 
 error_cleanup_dev:
 	kfree(mc_dev->regions);
-	kfree(mc_bus);
-	kfree(mc_dev);

Close, but that still doesn't help with anyone coming along later, how about adding:

drivers/bus/fsl-mc/fsl-mc-bus.c int fsl_mc_device_add(struct fsl_mc_obj_desc *obj_desc, · line 696

Quoted 3 lines
drivers/bus/fsl-mc/fsl-mc-bus.c +3 -0
+	/*
+	 * mc_bus allocates a private version of mc_dev
+	 * it is not appropriate to free the private version.

* which means we have to check the pointer before freeing it.
* Do not remove this check.

thanks,

greg k-h