Skip to content

Commit d694bf8

Browse files
IoanaCiorneichleroy
authored andcommitted
bus: fsl-mc: fix double-free on mc_dev
The blamed commit tried to simplify how the deallocations are done but, in the process, introduced a double-free on the mc_dev variable. In case the MC device is a DPRC, a new mc_bus is allocated and the mc_dev variable is just a reference to one of its fields. In this circumstance, on the error path only the mc_bus should be freed. This commit introduces back the following checkpatch warning which is a false-positive. WARNING: kfree(NULL) is safe and this check is probably not required + if (mc_bus) + kfree(mc_bus); Fixes: a042fbe ("staging: fsl-mc: simplify couple of deallocations") Signed-off-by: Ioana Ciornei <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Christophe Leroy <[email protected]>
1 parent 617a7ed commit d694bf8

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/bus/fsl-mc/fsl-mc-bus.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -906,8 +906,10 @@ int fsl_mc_device_add(struct fsl_mc_obj_desc *obj_desc,
906906

907907
error_cleanup_dev:
908908
kfree(mc_dev->regions);
909-
kfree(mc_bus);
910-
kfree(mc_dev);
909+
if (mc_bus)
910+
kfree(mc_bus);
911+
else
912+
kfree(mc_dev);
911913

912914
return error;
913915
}

0 commit comments

Comments
 (0)