From: Haotian Zhang <vulab@iscas.ac.cn>
To: Madhavan Srinivasan <maddy@linux.ibm.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Nicholas Piggin <npiggin@gmail.com>,
Shrikanth Hegde <sshegde@linux.ibm.com>,
Michael Bringmann <mwb@linux.vnet.ibm.com>
Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org
Subject: [PATCH] powerpc/pseries: fix device_node leak in drc-info lookup error paths
Date: Fri, 9 Oct 2026 11:54:45 +0800 [thread overview]
Message-ID: <20261009035445.3079660-1-vulab@iscas.ac.cn> (raw)
cpu_to_drc_index() and drc_index_to_cpu() acquire the /cpus device_node
with of_find_node_by_path() and then walk the ibm,drc-info property. When
an entry whose drc_type is not "CPU" is encountered, the code jumps to the
err label, which is *after* the err_of_node_put label, so of_node_put() is
skipped and the reference taken on the /cpus node is leaked on every such
exit.
Jump to err_of_node_put instead so the device_node reference is always
released.
Fixes: e83636ac3334 ("pseries/drc-info: Search DRC properties for CPU indexes")
Assisted-by: DeepSeek-V4.1-Flash
Signed-off-by: Haotian Zhang <vulab@iscas.ac.cn>
---
arch/powerpc/platforms/pseries/pseries_energy.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/platforms/pseries/pseries_energy.c b/arch/powerpc/platforms/pseries/pseries_energy.c
index fdaf85ecd39b..b3a1c34b3323 100644
--- a/arch/powerpc/platforms/pseries/pseries_energy.c
+++ b/arch/powerpc/platforms/pseries/pseries_energy.c
@@ -66,7 +66,7 @@ static u32 cpu_to_drc_index(int cpu)
of_read_drc_info_cell(&info, &value, &drc);
if (strncmp(drc.drc_type, "CPU", 3))
- goto err;
+ goto err_of_node_put;
if (thread_index < drc.last_drc_index)
break;
@@ -135,7 +135,7 @@ static int drc_index_to_cpu(u32 drc_index)
of_read_drc_info_cell(&info, &value, &drc);
if (strncmp(drc.drc_type, "CPU", 3))
- goto err;
+ goto err_of_node_put;
if (drc_index > drc.last_drc_index) {
cpu += drc.num_sequential_elems;
--
2.25.1
next reply other threads:[~2026-10-09 3:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-09 3:54 Haotian Zhang [this message]
2026-10-09 6:10 ` Krzysztof Kozlowski
2026-10-09 6:17 ` Shrikanth Hegde
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=20261009035445.3079660-1-vulab@iscas.ac.cn \
--to=vulab@iscas.ac.cn \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=maddy@linux.ibm.com \
--cc=mpe@ellerman.id.au \
--cc=mwb@linux.vnet.ibm.com \
--cc=npiggin@gmail.com \
--cc=sshegde@linux.ibm.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
all inboxes | Powered by JetHome®