| From 86637f92d3b1faf23b54d1ad9c68c2ced2ca85b0 Mon Sep 17 00:00:00 2001 |
| From: Qiushi Wu <wu000273@umn.edu> |
| Date: Thu, 28 May 2020 15:22:37 -0500 |
| Subject: [PATCH] EDAC: Fix reference count leaks |
| |
| commit 17ed808ad243192fb923e4e653c1338d3ba06207 upstream. |
| |
| When kobject_init_and_add() returns an error, it should be handled |
| because kobject_init_and_add() takes a 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. |
| |
| Therefore, replace calling kfree() and call kobject_put() and add a |
| missing kobject_put() in the edac_device_register_sysfs_main_kobj() |
| error path. |
| |
| [ bp: Massage and merge into a single patch. ] |
| |
| Fixes: b2ed215a3338 ("Kobject: change drivers/edac to use kobject_init_and_add") |
| Signed-off-by: Qiushi Wu <wu000273@umn.edu> |
| Signed-off-by: Borislav Petkov <bp@suse.de> |
| Link: https://lkml.kernel.org/r/20200528202238.18078-1-wu000273@umn.edu |
| Link: https://lkml.kernel.org/r/20200528203526.20908-1-wu000273@umn.edu |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/edac/edac_device_sysfs.c b/drivers/edac/edac_device_sysfs.c |
| index 0e7ea3591b78..5e7593753799 100644 |
| --- a/drivers/edac/edac_device_sysfs.c |
| +++ b/drivers/edac/edac_device_sysfs.c |
| @@ -275,6 +275,7 @@ int edac_device_register_sysfs_main_kobj(struct edac_device_ctl_info *edac_dev) |
| |
| /* Error exit stack */ |
| err_kobj_reg: |
| + kobject_put(&edac_dev->kobj); |
| module_put(edac_dev->owner); |
| |
| err_out: |
| 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); |
| -- |
| 2.27.0 |
| |