Commit 17ed808a authored May 28, 2020 by Qiushi Wu Committed by Borislav Petkov Jun 17, 2020

EDAC: Fix reference count leaks



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: 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

parent 8807e155

drivers/edac/edac_device_sysfs.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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:

drivers/edac/edac_pci_sysfs.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message