From: ruanjinjie <ruanjinjie@huawei.com>
To: <robh+dt@kernel.org>, <frowand.list@gmail.com>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <ruanjinjie@huawei.com>
Subject: [PATCH] of: overlay: fix null pointer dereferencing in find_dup_cset_node_entry() and find_dup_cset_prop()
Date: Tue, 6 Dec 2022 16:36:57 +0800 [thread overview]
Message-ID: <20221206083657.3202856-1-ruanjinjie@huawei.com> (raw)
when kmalloc() fail to allocate memory in kasprintf(), fn_1 or fn_2 will
be NULL, strcmp() will cause null pointer dereference.
Fixes: 2fe0e8769df9 ("of: overlay: check prevents multiple fragments touching same property")
Signed-off-by: ruanjinjie <ruanjinjie@huawei.com>
---
drivers/of/overlay.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index bd8ff4df723d..49c066b51148 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -545,6 +545,11 @@ static int find_dup_cset_node_entry(struct overlay_changeset *ovcs,
fn_1 = kasprintf(GFP_KERNEL, "%pOF", ce_1->np);
fn_2 = kasprintf(GFP_KERNEL, "%pOF", ce_2->np);
+ if (!fn_1 || !fn_2) {
+ kfree(fn_1);
+ kfree(fn_2);
+ return -ENOMEM;
+ }
node_path_match = !strcmp(fn_1, fn_2);
kfree(fn_1);
kfree(fn_2);
@@ -580,6 +585,11 @@ static int find_dup_cset_prop(struct overlay_changeset *ovcs,
fn_1 = kasprintf(GFP_KERNEL, "%pOF", ce_1->np);
fn_2 = kasprintf(GFP_KERNEL, "%pOF", ce_2->np);
+ if (!fn_1 || !fn_2) {
+ kfree(fn_1);
+ kfree(fn_2);
+ return -ENOMEM;
+ }
node_path_match = !strcmp(fn_1, fn_2);
kfree(fn_1);
kfree(fn_2);
--
2.25.1
next reply other threads:[~2022-12-06 8:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-06 8:36 ruanjinjie [this message]
2022-12-09 20:59 ` [PATCH] of: overlay: fix null pointer dereferencing in find_dup_cset_node_entry() and find_dup_cset_prop() Rob Herring
2022-12-11 2:14 ` Ruan Jinjie
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=20221206083657.3202856-1-ruanjinjie@huawei.com \
--to=ruanjinjie@huawei.com \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@kernel.org \
/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).