thermal: int340x: Fix sysfs group leak on DLVR registration failure

kaushlen · rafaeljw · commit 15176b818e04 · 2026-02-11T20:56:01.000+01:00
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> Link: https://patch.msgid.link/LV3PR11MB876881B77D32A2854AD2908EF563A@LV3PR11MB8768.namprd11.prod.outlook.com Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c
@@ -467,8 +467,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) {

Original file line number	Diff line number	Diff line change
`@@ -467,8 +467,11 @@ int proc_thermal_rfim_add(struct pci_dev pdev, struct proc_thermal_device proc`
`467`	`467`	`break;`
`468`	`468`	`}`
`469`	`469`	`ret = sysfs_create_group(&pdev->dev.kobj, &dlvr_attribute_group);`
`470`		`- if (ret)`
	`470`	`+ if (ret) {`
	`471`	`+ if (proc_priv->mmio_feature_mask & PROC_THERMAL_FEATURE_FIVR)`
	`472`	`+ sysfs_remove_group(&pdev->dev.kobj, &fivr_attribute_group);`
`471`	`473`	`return ret;`
	`474`	`+ }`
`472`	`475`	`}`
`473`	`476`
`474`	`477`	`if (proc_priv->mmio_feature_mask & PROC_THERMAL_FEATURE_DVFS) {`