From: Liang He <windhl@126.com>
To: davem@davemloft.net
Cc: windhl@126.com, sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2] sbus/char: Fix refcount leak bugs in openprom.c
Date: Mon, 20 Jun 2022 23:32:08 +0800 [thread overview]
Message-ID: <20220620153208.4075636-1-windhl@126.com> (raw)
In opiocgetnext(), we need a of_node_put() to keep refcount balance.
NOTE: we should not change 'dp' as it will used as the arg of
of_node_put().
Signed-off-by: Liang He <windhl@126.com>
---
changelog:
v2: (1) consider of_find_node_by_path() and of_find_node_by_phandle()
v1: this is a wrong patch as dp has been updated by its sibling or
child.
drivers/sbus/char/openprom.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c
index 30b9751aad30..b5907e0c24e5 100644
--- a/drivers/sbus/char/openprom.c
+++ b/drivers/sbus/char/openprom.c
@@ -494,7 +494,7 @@ static int opiocset(void __user *argp, DATA *data)
static int opiocgetnext(unsigned int cmd, void __user *argp)
{
- struct device_node *dp;
+ struct device_node *dp, *tp;
phandle nd;
BUILD_BUG_ON(sizeof(phandle) != sizeof(int));
@@ -506,18 +506,24 @@ static int opiocgetnext(unsigned int cmd, void __user *argp)
if (cmd != OPIOCGETNEXT)
return -EINVAL;
dp = of_find_node_by_path("/");
+ if (dp)
+ nd = dp->phandle;
} else {
dp = of_find_node_by_phandle(nd);
nd = 0;
if (dp) {
if (cmd == OPIOCGETNEXT)
- dp = dp->sibling;
+ tp = dp->sibling;
else
- dp = dp->child;
+ tp = dp->child;
}
+
+ if (tp)
+ nd = tp->phandle;
}
- if (dp)
- nd = dp->phandle;
+
+ of_node_put(dp);
+
if (copy_to_user(argp, &nd, sizeof(phandle)))
return -EFAULT;
--
2.25.1
reply other threads:[~2022-06-20 15:32 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20220620153208.4075636-1-windhl@126.com \
--to=windhl@126.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=sparclinux@vger.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®