lkml.org 
[lkml]   [2019]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.1 117/219] EDAC/sysfs: Fix memory leak when creating a csrow object
    Date
    From: Pan Bian <bianpan2016@163.com>

    [ Upstream commit 585fb3d93d32dbe89e718b85009f9c322cc554cd ]

    In edac_create_csrow_object(), the reference to the object is not
    released when adding the device to the device hierarchy fails
    (device_add()). This may result in a memory leak.

    Signed-off-by: Pan Bian <bianpan2016@163.com>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Cc: James Morse <james.morse@arm.com>
    Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
    Cc: linux-edac <linux-edac@vger.kernel.org>
    Link: https://lkml.kernel.org/r/1555554438-103953-1-git-send-email-bianpan2016@163.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/edac/edac_mc_sysfs.c | 8 +++++++-
    1 file changed, 7 insertions(+), 1 deletion(-)

    diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
    index bf9273437e3f..7c01e1cc030c 100644
    --- a/drivers/edac/edac_mc_sysfs.c
    +++ b/drivers/edac/edac_mc_sysfs.c
    @@ -404,6 +404,8 @@ static inline int nr_pages_per_csrow(struct csrow_info *csrow)
    static int edac_create_csrow_object(struct mem_ctl_info *mci,
    struct csrow_info *csrow, int index)
    {
    + int err;
    +
    csrow->dev.type = &csrow_attr_type;
    csrow->dev.groups = csrow_dev_groups;
    device_initialize(&csrow->dev);
    @@ -415,7 +417,11 @@ static int edac_create_csrow_object(struct mem_ctl_info *mci,
    edac_dbg(0, "creating (virtual) csrow node %s\n",
    dev_name(&csrow->dev));

    - return device_add(&csrow->dev);
    + err = device_add(&csrow->dev);
    + if (err)
    + put_device(&csrow->dev);
    +
    + return err;
    }

    /* Create a CSROW object under specifed edac_mc_device */
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-07-15 17:15    [W:4.048 / U:2.664 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site