From: Lixin Wang <alan.1.wang@nokia-sbell.com>
To: Pantelis Antoniou <pantelis.antoniou@konsulko.com>,
Rob Herring <robh+dt@kernel.org>,
Frank Rowand <frowand.list@gmail.com>
Cc: <linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org>,
alawang <alan.1.wang@nokia-sbell.com>
Subject: [PATCH] of: overlay: fix memory leak related to duplicated property
Date: Mon, 16 Oct 2017 17:54:32 +0800 [thread overview]
Message-ID: <1508147672-58291-1-git-send-email-alan.1.wang@nokia-sbell.com> (raw)
In-Reply-To: <1507864056-52089-1-git-send-email-alan.1.wang@nokia-sbell.com>
From: alawang <alan.1.wang@nokia-sbell.com>
Function of_changeset_add_property or of_changeset_update_property may
fails. In this case the property just allocated is never deallocated.
Signed-off-by: Lixin Wang <alan.1.wang@nokia-sbell.com>
---
drivers/of/overlay.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index 8ecfee3..af3b9a1 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -162,6 +162,7 @@ static int of_overlay_apply_single_property(struct of_overlay *ov,
bool is_symbols_node)
{
struct property *propn = NULL, *tprop;
+ int ret = 0;
/* NOTE: Multiple changes of single properties not supported */
tprop = of_find_property(target, prop->name, NULL);
@@ -186,10 +187,16 @@ static int of_overlay_apply_single_property(struct of_overlay *ov,
/* not found? add */
if (tprop == NULL)
- return of_changeset_add_property(&ov->cset, target, propn);
-
- /* found? update */
- return of_changeset_update_property(&ov->cset, target, propn);
+ ret = of_changeset_add_property(&ov->cset, target, propn);
+ else /* found? update */
+ ret = of_changeset_update_property(&ov->cset, target, propn);
+
+ if (ret) {
+ kfree(propn->name);
+ kfree(propn->value);
+ kfree(propn);
+ }
+ return ret;
}
static int of_overlay_apply_single_device_node(struct of_overlay *ov,
--
2.6.2
next prev parent reply other threads:[~2017-10-16 9:56 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-13 1:53 [PATCH 1/2] " alawang
2017-10-13 3:07 ` [PATCH] " Lixin Wang
2017-10-13 20:49 ` Rob Herring
2017-10-13 22:04 ` Frank Rowand
2017-10-16 2:35 ` Wang, Alan 1. (NSB - CN/Hangzhou)
2017-10-16 6:07 ` Frank Rowand
2017-10-16 20:54 ` Rob Herring
2017-10-16 9:54 ` Lixin Wang [this message]
2017-10-17 14:06 ` Rob Herring
2017-10-13 21:39 ` [PATCH 1/2] " Frank Rowand
2017-10-16 2:29 ` Wang, Alan 1. (NSB - CN/Hangzhou)
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=1508147672-58291-1-git-send-email-alan.1.wang@nokia-sbell.com \
--to=alan.1.wang@nokia-sbell.com \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pantelis.antoniou@konsulko.com \
--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
all inboxes | Powered by JetHome®