diff mbox series

edac: Fix reference count leak in edac_pci_main_kobj_setup.

Message ID 20200528202238.18078-1-wu000273@umn.edu (mailing list archive)
State New, archived
Headers show
Series edac: Fix reference count leak in edac_pci_main_kobj_setup. | expand

Commit Message

wu000273@umn.edu May 28, 2020, 8:22 p.m. UTC 
From: Qiushi Wu <wu000273@umn.edu>

kobject_init_and_add() should be handled when it return an error,
because kobject_init_and_add() takes reference even when it fails.
If this function returns an error, kobject_put() must be called to
properly clean up the memory associated with the object. Previous
commit "b8eb718348b8" fixed a similar problem. Thus replace calling
kfree() by calling kobject_put().

Fixes: b2ed215a3338 ("Kobject: change drivers/edac to use kobject_init_and_add")
Signed-off-by: Qiushi Wu <wu000273@umn.edu>
---
 drivers/edac/edac_pci_sysfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Borislav Petkov June 17, 2020, 1:56 p.m. UTC | #1 
On Thu, May 28, 2020 at 03:22:37PM -0500, wu000273@umn.edu wrote:
> From: Qiushi Wu <wu000273@umn.edu>
> 
> kobject_init_and_add() should be handled when it return an error,
> because kobject_init_and_add() takes reference even when it fails.
> If this function returns an error, kobject_put() must be called to
> properly clean up the memory associated with the object. Previous
> commit "b8eb718348b8" fixed a similar problem. Thus replace calling
> kfree() by calling kobject_put().
> 
> Fixes: b2ed215a3338 ("Kobject: change drivers/edac to use kobject_init_and_add")
> Signed-off-by: Qiushi Wu <wu000273@umn.edu>
> ---
>  drivers/edac/edac_pci_sysfs.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
> index 72c9eb9fdffb..53042af7262e 100644
> --- a/drivers/edac/edac_pci_sysfs.c
> +++ b/drivers/edac/edac_pci_sysfs.c
> @@ -386,7 +386,7 @@ static int edac_pci_main_kobj_setup(void)
>  
>  	/* Error unwind statck */
>  kobject_init_and_add_fail:
> -	kfree(edac_pci_top_main_kobj);
> +	kobject_put(edac_pci_top_main_kobj);
>  
>  kzalloc_fail:
>  	module_put(THIS_MODULE);
> -- 

This and

https://lkml.kernel.org/r/20200528203526.20908-1-wu000273@umn.edu

merged into a single patch and applied.

Thx.
diff mbox series

Patch

diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
index 72c9eb9fdffb..53042af7262e 100644
--- a/drivers/edac/edac_pci_sysfs.c
+++ b/drivers/edac/edac_pci_sysfs.c
@@ -386,7 +386,7 @@  static int edac_pci_main_kobj_setup(void)
 
 	/* Error unwind statck */
 kobject_init_and_add_fail:
-	kfree(edac_pci_top_main_kobj);
+	kobject_put(edac_pci_top_main_kobj);
 
 kzalloc_fail:
 	module_put(THIS_MODULE);