diff options
| author | Qiushi Wu <wu000273@umn.edu> | 2020-05-28 22:22:37 +0200 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2020-06-17 15:38:35 +0200 |
| commit | 17ed808ad243192fb923e4e653c1338d3ba06207 (patch) | |
| tree | cac6394e4118c2a5b2879200b76320793e8194b8 /drivers | |
| parent | EDAC, {skx,i10nm}: Use CPU stepping macro to pass configurations (diff) | |
| download | linux-17ed808ad243192fb923e4e653c1338d3ba06207.tar.xz linux-17ed808ad243192fb923e4e653c1338d3ba06207.zip | |
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: 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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/edac/edac_device_sysfs.c | 1 | ||||
| -rw-r--r-- | drivers/edac/edac_pci_sysfs.c | 2 |
2 files changed, 2 insertions, 1 deletions
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); |