From: trix@redhat.com
To: stuyoder@gmail.com, laurentiu.tudor@nxp.com, gregkh@linuxfoundation.org
Cc: linux-kernel@vger.kernel.org, Tom Rix <trix@redhat.com>
Subject: [PATCH v3] bus: fsl-mc: fix invalid free in fsl_mc_device_add
Date: Thu, 9 Jul 2020 08:31:19 -0700 [thread overview]
Message-ID: <20200709153119.5051-1-trix@redhat.com> (raw)
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
v2: add gregkh's suggestion to comment.
drivers/bus/fsl-mc/fsl-mc-bus.c | 12 ++++++++++--
1 file changed, 10 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..839d96d03f0d 100644
--- a/drivers/bus/fsl-mc/fsl-mc-bus.c
+++ b/drivers/bus/fsl-mc/fsl-mc-bus.c
@@ -691,8 +691,16 @@ 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.
+ * Which means we have to check the pointer before freeing it.
+ * Do not remove this check.
+ */
+ if (mc_bus)
+ kfree(mc_bus);
+ else
+ kfree(mc_dev);
return error;
}
--
2.18.1
next reply other threads:[~2020-07-09 15:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-09 15:31 trix [this message]
2020-07-10 7:48 ` [PATCH v3] bus: fsl-mc: fix invalid free in fsl_mc_device_add Greg KH
2020-07-10 10:32 ` Laurentiu Tudor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200709153119.5051-1-trix@redhat.com \
--to=trix@redhat.com \
--cc=gregkh@linuxfoundation.org \
--cc=laurentiu.tudor@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stuyoder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).