lkml.org 
[lkml]   [2020]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 050/228] EDAC: Fix reference count leaks
    Date
    From: Qiushi Wu <wu000273@umn.edu>

    [ Upstream commit 17ed808ad243192fb923e4e653c1338d3ba06207 ]

    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: Sasha Levin <sashal@kernel.org>
    ---
    drivers/edac/edac_device_sysfs.c | 1 +
    drivers/edac/edac_pci_sysfs.c | 2 +-
    2 files changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/edac/edac_device_sysfs.c b/drivers/edac/edac_device_sysfs.c
    index 0e7ea3591b781..5e75937537997 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 72c9eb9fdffbe..53042af7262e2 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.25.1


    \
     
     \ /
      Last update: 2020-08-20 12:08    [W:4.226 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site