* [PATCH] thermal: int340x: Fix sysfs group leak on DLVR registration failure
@ 2025-12-15 5:45 Kaushlendra Kumar
2026-02-11 8:23 ` [RESEND, Cc only] " Kumar, Kaushlendra
0 siblings, 1 reply; 4+ messages in thread
From: Kaushlendra Kumar @ 2025-12-15 5:45 UTC (permalink / raw)
To: rafael, daniel.lezcano, rui.zhang, lukasz.luba
Cc: linux-pm, Kaushlendra Kumar
When DLVR sysfs group creation fails in proc_thermal_rfim_add(),
the function returns immediately without cleaning up the FIVR
group that may have been created earlier.
Add proper error unwinding to remove the FIVR group before
returning failure.
Signed-off-by: Kaushlendra Kumar <kaushlendra.kumar@intel.com>
---
.../thermal/intel/int340x_thermal/processor_thermal_rfim.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c
index 589a3a71f0c4..ba88d878c998 100644
--- a/drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c
+++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c
@@ -466,8 +466,11 @@ int proc_thermal_rfim_add(struct pci_dev *pdev, struct proc_thermal_device *proc
break;
}
ret = sysfs_create_group(&pdev->dev.kobj, &dlvr_attribute_group);
- if (ret)
+ if (ret) {
+ if (proc_priv->mmio_feature_mask & PROC_THERMAL_FEATURE_FIVR)
+ sysfs_remove_group(&pdev->dev.kobj, &fivr_attribute_group);
return ret;
+ }
}
if (proc_priv->mmio_feature_mask & PROC_THERMAL_FEATURE_DVFS) {
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [RESEND, Cc only] RE: [PATCH] thermal: int340x: Fix sysfs group leak on DLVR registration failure
2025-12-15 5:45 [PATCH] thermal: int340x: Fix sysfs group leak on DLVR registration failure Kaushlendra Kumar
@ 2026-02-11 8:23 ` Kumar, Kaushlendra
2026-02-11 19:31 ` srinivas pandruvada
0 siblings, 1 reply; 4+ messages in thread
From: Kumar, Kaushlendra @ 2026-02-11 8:23 UTC (permalink / raw)
To: rafael@kernel.org, daniel.lezcano@linaro.org, Zhang, Rui,
lukasz.luba@arm.com
Cc: linux-pm@vger.kernel.org, srinivas pandruvada
Adding Cc: srinivas.pandruvada@linux.intel.com
No code changes.
Original patch: https://patchwork.kernel.org/project/linux-pm/patch/20251215054538.3483331-1-kaushlendra.kumar@intel.com/
-----Original Message-----
From: Kumar, Kaushlendra <kaushlendra.kumar@intel.com>
Sent: Monday, December 15, 2025 11:16 AM
To: rafael@kernel.org; daniel.lezcano@linaro.org; Zhang, Rui <rui.zhang@intel.com>; lukasz.luba@arm.com
Cc: linux-pm@vger.kernel.org; Kumar, Kaushlendra <kaushlendra.kumar@intel.com>
Subject: [PATCH] thermal: int340x: Fix sysfs group leak on DLVR registration failure
When DLVR sysfs group creation fails in proc_thermal_rfim_add(), the function returns immediately without cleaning up the FIVR group that may have been created earlier.
Add proper error unwinding to remove the FIVR group before returning failure.
Signed-off-by: Kaushlendra Kumar <kaushlendra.kumar@intel.com>
---
.../thermal/intel/int340x_thermal/processor_thermal_rfim.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c
index 589a3a71f0c4..ba88d878c998 100644
--- a/drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c
+++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c
@@ -466,8 +466,11 @@ int proc_thermal_rfim_add(struct pci_dev *pdev, struct proc_thermal_device *proc
break;
}
ret = sysfs_create_group(&pdev->dev.kobj, &dlvr_attribute_group);
- if (ret)
+ if (ret) {
+ if (proc_priv->mmio_feature_mask & PROC_THERMAL_FEATURE_FIVR)
+ sysfs_remove_group(&pdev->dev.kobj, &fivr_attribute_group);
return ret;
+ }
}
if (proc_priv->mmio_feature_mask & PROC_THERMAL_FEATURE_DVFS) {
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [RESEND, Cc only] RE: [PATCH] thermal: int340x: Fix sysfs group leak on DLVR registration failure
2026-02-11 8:23 ` [RESEND, Cc only] " Kumar, Kaushlendra
@ 2026-02-11 19:31 ` srinivas pandruvada
2026-02-11 19:57 ` Rafael J. Wysocki
0 siblings, 1 reply; 4+ messages in thread
From: srinivas pandruvada @ 2026-02-11 19:31 UTC (permalink / raw)
To: Kumar, Kaushlendra, rafael@kernel.org, daniel.lezcano@linaro.org,
Zhang, Rui, lukasz.luba@arm.com
Cc: linux-pm@vger.kernel.org
On Wed, 2026-02-11 at 08:23 +0000, Kumar, Kaushlendra wrote:
> Adding Cc: srinivas.pandruvada@linux.intel.com
>
> No code changes.
>
> Original patch:
> https://patchwork.kernel.org/project/linux-pm/patch/20251215054538.3483331-1-kaushlendra.kumar@intel.com/
>
> -----Original Message-----
> From: Kumar, Kaushlendra <kaushlendra.kumar@intel.com>
> Sent: Monday, December 15, 2025 11:16 AM
> To: rafael@kernel.org; daniel.lezcano@linaro.org; Zhang, Rui
> <rui.zhang@intel.com>; lukasz.luba@arm.com
> Cc: linux-pm@vger.kernel.org; Kumar, Kaushlendra
> <kaushlendra.kumar@intel.com>
> Subject: [PATCH] thermal: int340x: Fix sysfs group leak on DLVR
> registration failure
>
> When DLVR sysfs group creation fails in proc_thermal_rfim_add(), the
> function returns immediately without cleaning up the FIVR group that
> may have been created earlier.
>
> Add proper error unwinding to remove the FIVR group before returning
> failure.
>
> Signed-off-by: Kaushlendra Kumar <kaushlendra.kumar@intel.com>
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
> ---
> .../thermal/intel/int340x_thermal/processor_thermal_rfim.c | 5
> ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git
> a/drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c
> b/drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c
> index 589a3a71f0c4..ba88d878c998 100644
> --- a/drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c
> +++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c
> @@ -466,8 +466,11 @@ int proc_thermal_rfim_add(struct pci_dev *pdev,
> struct proc_thermal_device *proc
> break;
> }
> ret = sysfs_create_group(&pdev->dev.kobj,
> &dlvr_attribute_group);
> - if (ret)
> + if (ret) {
> + if (proc_priv->mmio_feature_mask &
> PROC_THERMAL_FEATURE_FIVR)
> + sysfs_remove_group(&pdev->dev.kobj,
> &fivr_attribute_group);
> return ret;
> + }
> }
>
> if (proc_priv->mmio_feature_mask &
> PROC_THERMAL_FEATURE_DVFS) {
> --
> 2.34.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [RESEND, Cc only] RE: [PATCH] thermal: int340x: Fix sysfs group leak on DLVR registration failure
2026-02-11 19:31 ` srinivas pandruvada
@ 2026-02-11 19:57 ` Rafael J. Wysocki
0 siblings, 0 replies; 4+ messages in thread
From: Rafael J. Wysocki @ 2026-02-11 19:57 UTC (permalink / raw)
To: srinivas pandruvada, Kumar, Kaushlendra
Cc: daniel.lezcano@linaro.org, Zhang, Rui, lukasz.luba@arm.com,
linux-pm@vger.kernel.org
On Wed, Feb 11, 2026 at 8:32 PM srinivas pandruvada
<srinivas.pandruvada@linux.intel.com> wrote:
>
> On Wed, 2026-02-11 at 08:23 +0000, Kumar, Kaushlendra wrote:
> > Adding Cc: srinivas.pandruvada@linux.intel.com
> >
> > No code changes.
> >
> > Original patch:
> > https://patchwork.kernel.org/project/linux-pm/patch/20251215054538.3483331-1-kaushlendra.kumar@intel.com/
> >
> > -----Original Message-----
> > From: Kumar, Kaushlendra <kaushlendra.kumar@intel.com>
> > Sent: Monday, December 15, 2025 11:16 AM
> > To: rafael@kernel.org; daniel.lezcano@linaro.org; Zhang, Rui
> > <rui.zhang@intel.com>; lukasz.luba@arm.com
> > Cc: linux-pm@vger.kernel.org; Kumar, Kaushlendra
> > <kaushlendra.kumar@intel.com>
> > Subject: [PATCH] thermal: int340x: Fix sysfs group leak on DLVR
> > registration failure
> >
> > When DLVR sysfs group creation fails in proc_thermal_rfim_add(), the
> > function returns immediately without cleaning up the FIVR group that
> > may have been created earlier.
> >
> > Add proper error unwinding to remove the FIVR group before returning
> > failure.
> >
> > Signed-off-by: Kaushlendra Kumar <kaushlendra.kumar@intel.com>
>
> Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Applied as 7.0-rc material, thanks!
> > ---
> > .../thermal/intel/int340x_thermal/processor_thermal_rfim.c | 5
> > ++++-
> > 1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git
> > a/drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c
> > b/drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c
> > index 589a3a71f0c4..ba88d878c998 100644
> > --- a/drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c
> > +++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c
> > @@ -466,8 +466,11 @@ int proc_thermal_rfim_add(struct pci_dev *pdev,
> > struct proc_thermal_device *proc
> > break;
> > }
> > ret = sysfs_create_group(&pdev->dev.kobj,
> > &dlvr_attribute_group);
> > - if (ret)
> > + if (ret) {
> > + if (proc_priv->mmio_feature_mask &
> > PROC_THERMAL_FEATURE_FIVR)
> > + sysfs_remove_group(&pdev->dev.kobj,
> > &fivr_attribute_group);
> > return ret;
> > + }
> > }
> >
> > if (proc_priv->mmio_feature_mask &
> > PROC_THERMAL_FEATURE_DVFS) {
> > --
> > 2.34.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-02-11 19:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-12-15 5:45 [PATCH] thermal: int340x: Fix sysfs group leak on DLVR registration failure Kaushlendra Kumar
2026-02-11 8:23 ` [RESEND, Cc only] " Kumar, Kaushlendra
2026-02-11 19:31 ` srinivas pandruvada
2026-02-11 19:57 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox