Commit 6aae61fb authored by Qiushi Wu's avatar Qiushi Wu Committed by Kelsey Skunberg

EDAC: Fix reference count leaks

BugLink: https://bugs.launchpad.net/bugs/1892822

[ Upstream commit 17ed808a ]

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: b2ed215a ("Kobject: change drivers/edac to use kobject_init_and_add")
Signed-off-by: default avatarQiushi Wu <wu000273@umn.edu>
Signed-off-by: default avatarBorislav 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.eduSigned-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: default avatarIan May <ian.may@canonical.com>
Signed-off-by: default avatarKelsey Skunberg <kelsey.skunberg@canonical.com>
parent 02f5e2c9
...@@ -280,6 +280,7 @@ int edac_device_register_sysfs_main_kobj(struct edac_device_ctl_info *edac_dev) ...@@ -280,6 +280,7 @@ int edac_device_register_sysfs_main_kobj(struct edac_device_ctl_info *edac_dev)
/* Error exit stack */ /* Error exit stack */
err_kobj_reg: err_kobj_reg:
kobject_put(&edac_dev->kobj);
module_put(edac_dev->owner); module_put(edac_dev->owner);
err_mod_get: err_mod_get:
......
...@@ -394,7 +394,7 @@ static int edac_pci_main_kobj_setup(void) ...@@ -394,7 +394,7 @@ static int edac_pci_main_kobj_setup(void)
/* Error unwind statck */ /* Error unwind statck */
kobject_init_and_add_fail: kobject_init_and_add_fail:
kfree(edac_pci_top_main_kobj); kobject_put(edac_pci_top_main_kobj);
kzalloc_fail: kzalloc_fail:
module_put(THIS_MODULE); module_put(THIS_MODULE);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment