2023-11-26 10:02:29

by Kunwu Chan

Subject: [PATCH] powerpc/powernv: Fix null pointer dereference in opal_powercap_init

kasprintf() returns a pointer to dynamically allocated memory
which can be NULL upon failure.

Fixes: b9ef7b4b867f ("powerpc: Convert to using %pOFn instead of device_node.name")
Signed-off-by: Kunwu Chan <[email protected]>
---
arch/powerpc/platforms/powernv/opal-powercap.c | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/arch/powerpc/platforms/powernv/opal-powercap.c b/arch/powerpc/platforms/powernv/opal-powercap.c
index 7bfe4cbeb35a..ea917266aa17 100644
--- a/arch/powerpc/platforms/powernv/opal-powercap.c
+++ b/arch/powerpc/platforms/powernv/opal-powercap.c
@@ -196,6 +196,12 @@ void __init opal_powercap_init(void)

j = 0;
pcaps[i].pg.name = kasprintf(GFP_KERNEL, "%pOFn", node);
+ if (!pcaps[i].pg.name) {
+ kfree(pcaps[i].pattrs);
+ kfree(pcaps[i].pg.attrs);
+ goto out_pcaps_pattrs;
+ }
+
if (has_min) {
powercap_add_attr(min, "powercap-min",
&pcaps[i].pattrs[j]);
--
2.34.1

2023-12-21 10:42:49

by Michael Ellerman

Subject: Re: [PATCH] powerpc/powernv: Fix null pointer dereference in opal_powercap_init

On Sun, 26 Nov 2023 17:57:39 +0800, Kunwu Chan wrote:
> kasprintf() returns a pointer to dynamically allocated memory
> which can be NULL upon failure.
>
>

Applied to powerpc/next.

[1/1] powerpc/powernv: Fix null pointer dereference in opal_powercap_init
https://git.kernel.org/powerpc/c/e123015c0ba859cf48aa7f89c5016cc6e98e018d

cheers