From: Michael Ellerman <mpe@ellerman•id.au>
To: Erhard Furtner <erhard_f@mailbox•org>, linuxppc-dev@ozlabs•org
Cc: Erhard Furtner <erhard_f@mailbox•org>
Subject: Re: [PATCH] of: unittest: fix memory leak in attach_node_and_children
Date: Tue, 19 Nov 2019 12:25:52 +1100 [thread overview]
Message-ID: <87eey4d5cv.fsf@mpe.ellerman.id.au> (raw)
In-Reply-To: <20191114184334.2866770-1-erhard_f@mailbox.org>
Erhard Furtner <erhard_f@mailbox•org> writes:
> In attach_node_and_children memory is allocated for full_name via
> kasprintf. If the condition of the 1st if is not met the function
> returns early without freeing the memory. Add a kfree() to fix that.
It would be good to mention that this was detected with kmemleak.
It looks like the leak was introduced by this commit:
Fixes: 5babefb7f7ab ("of: unittest: allow base devicetree to have symbol metadata")
> Signed-off-by: Erhard Furtner <erhard_f@mailbox•org>
> ---
> drivers/of/unittest.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
Reviewed-by: Michael Ellerman <mpe@ellerman•id.au>
Because this patch is to drivers/of, you need to send it to the right
folks. You can work out who with:
$ ./scripts/get_maintainer.pl -f drivers/of/unittest.c
robh+dt@kernel•org
frowand.list@gmail•com
devicetree@vger•kernel.org
linux-kernel@vger•kernel.org
So to get it merged you should send a v2 (ie. with "PATCH v2" in the
subject), and Cc those people above as well as linuxppc-dev.
You should include the Fixes and Reviewed-by tags I've posted above in
your v2.
cheers
> diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
> index 92e895d86458..ca7823eef2b4 100644
> --- a/drivers/of/unittest.c
> +++ b/drivers/of/unittest.c
> @@ -1146,8 +1146,10 @@ static void attach_node_and_children(struct device_node *np)
> full_name = kasprintf(GFP_KERNEL, "%pOF", np);
>
> if (!strcmp(full_name, "/__local_fixups__") ||
> - !strcmp(full_name, "/__fixups__"))
> + !strcmp(full_name, "/__fixups__")) {
> + kfree(full_name);
> return;
> + }
>
> dup = of_find_node_by_path(full_name);
> kfree(full_name);
> --
> 2.23.0
next prev parent reply other threads:[~2019-11-19 1:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-14 18:43 [PATCH] of: unittest: fix memory leak in attach_node_and_children Erhard Furtner
2019-11-19 1:25 ` Michael Ellerman [this message]
2019-11-20 21:09 ` Tyrel Datwyler
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=87eey4d5cv.fsf@mpe.ellerman.id.au \
--to=mpe@ellerman$(echo .)id.au \
--cc=erhard_f@mailbox$(echo .)org \
--cc=linuxppc-dev@ozlabs$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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