* [PATCH v2] bus: fsl-mc: fix invalid free in fsl_mc_device_add
@ 2020-07-09 12:41 trix
2020-07-09 13:37 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: trix @ 2020-07-09 12:41 UTC (permalink / raw)
To: stuyoder, laurentiu.tudor, gregkh; +Cc: linux-kernel, Tom Rix
From: Tom Rix <trix@redhat.com>
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")
Signed-off-by: Tom Rix <trix@redhat.com>
---
v1: add a comment to explain freeing uniqueness
drivers/bus/fsl-mc/fsl-mc-bus.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c
index 40526da5c6a6..df10ed430baa 100644
--- a/drivers/bus/fsl-mc/fsl-mc-bus.c
+++ b/drivers/bus/fsl-mc/fsl-mc-bus.c
@@ -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;
}
--
2.18.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] bus: fsl-mc: fix invalid free in fsl_mc_device_add
2020-07-09 12:41 [PATCH v2] bus: fsl-mc: fix invalid free in fsl_mc_device_add trix
@ 2020-07-09 13:37 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2020-07-09 13:37 UTC (permalink / raw)
To: trix; +Cc: stuyoder, laurentiu.tudor, linux-kernel
On Thu, Jul 09, 2020 at 05:41:15AM -0700, trix@redhat.com wrote:
> From: Tom Rix <trix@redhat.com>
>
> 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")
>
> Signed-off-by: Tom Rix <trix@redhat.com>
> ---
> v1: add a comment to explain freeing uniqueness
>
> drivers/bus/fsl-mc/fsl-mc-bus.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c
> index 40526da5c6a6..df10ed430baa 100644
> --- a/drivers/bus/fsl-mc/fsl-mc-bus.c
> +++ b/drivers/bus/fsl-mc/fsl-mc-bus.c
> @@ -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:
> + /*
> + * 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-07-09 13:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-09 12:41 [PATCH v2] bus: fsl-mc: fix invalid free in fsl_mc_device_add trix
2020-07-09 13:37 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).