Skip to contentSkip to conversation

platform/x86: intel_pmc_core: fix memleak on registration failure

PATCH In review Johan Hovold 3 participants 3 messages Dec 22, 2021 – Dec 23, 2021

Subsystems (3)
Stable branch x86 platform drivers Intel PMC core driver
lore
Share & tools
lore

Johan Hovold

author
#0 lore raw

PATCH 1/1 platform/x86: intel_pmc_core: fix memleak on registration failure

In case device registration fails during module initialisation, the platform device structure needs to be freed using platform_device_put() to properly free all resources (e.g. the device name).

Fixes 938835aa903a ("platform/x86: intel_pmc_core: do not create a static struct device")
Cc [email protected] # 5.9
Signed-off-by Johan Hovold <[email protected]>
---
 drivers/platform/x86/intel/pmc/pltdrv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/intel/pmc/pltdrv.c +1 -1
index 73797680b895..15ca8afdd973 100644
@@ -65,7 +65,7 @@ static int __init pmc_core_platform_init(void)
 
 	retval = platform_device_register(pmc_core_device);
 	if (retval)
-		kfree(pmc_core_device);
+		platform_device_put(pmc_core_device);
 
 	return retval;
 }
Signature · 1 line
2.32.0
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 27 lines · Johan Hovold

In case device registration fails during module initialisation, the platform device structure needs to be freed using platform_device_put() to properly free all resources (e.g. the device name).

Fixes 938835aa903a ("platform/x86: intel_pmc_core: do not create a static struct device")
Cc [email protected] # 5.9
Signed-off-by Johan Hovold <[email protected]>
---
 drivers/platform/x86/intel/pmc/pltdrv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/intel/pmc/pltdrv.c +1 -1
index 73797680b895..15ca8afdd973 100644
@@ -65,7 +65,7 @@ static int __init pmc_core_platform_init(void)
 
 	retval = platform_device_register(pmc_core_device);
 	if (retval)
-		kfree(pmc_core_device);
+		platform_device_put(pmc_core_device);
 
 	return retval;
 }
Signature · 1 line
2.32.0
Reviewed-by Greg Kroah-Hartman <[email protected]>
#2 lore raw
In reply to Johan Hovold

Hi,

Quoted 7 lines · Johan Hovold

In case device registration fails during module initialisation, the platform device structure needs to be freed using platform_device_put() to properly free all resources (e.g. the device name).

Fixes 938835aa903a ("platform/x86: intel_pmc_core: do not create a static struct device")
Cc [email protected] # 5.9
Signed-off-by Johan Hovold <[email protected]>

Thank you for your patch, I've applied this patch to my review-hans branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans

Note it will show up in my review-hans branch once I've pushed my local branch there, which might take a while.

Once I've run some tests on this branch the patches there will be added to the platform-drivers-x86/for-next branch and eventually will be included in the pdx86 pull-request to Linus for the next merge-window.

Regards,

Hans

Quoted 18 lines
---
 drivers/platform/x86/intel/pmc/pltdrv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/intel/pmc/pltdrv.c +1 -1
index 73797680b895..15ca8afdd973 100644
@@ -65,7 +65,7 @@ static int __init pmc_core_platform_init(void)
 
 	retval = platform_device_register(pmc_core_device);
 	if (retval)
-		kfree(pmc_core_device);
+		platform_device_put(pmc_core_device);
 
 	return retval;
 }