lkml.org 
[lkml]   [2021]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.10 15/16] nilfs2: fix memory leak in nilfs_sysfs_create_snapshot_group
    Date
    From: Nanyong Sun <sunnanyong@huawei.com>

    [ Upstream commit b2fe39c248f3fa4bbb2a20759b4fdd83504190f7 ]

    If kobject_init_and_add returns with error, kobject_put() is needed here
    to avoid memory leak, because kobject_init_and_add may return error
    without freeing the memory associated with the kobject it allocated.

    Link: https://lkml.kernel.org/r/20210629022556.3985106-6-sunnanyong@huawei.com
    Link: https://lkml.kernel.org/r/1625651306-10829-6-git-send-email-konishi.ryusuke@gmail.com
    Signed-off-by: Nanyong Sun <sunnanyong@huawei.com>
    Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/nilfs2/sysfs.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/fs/nilfs2/sysfs.c b/fs/nilfs2/sysfs.c
    index 34893a57a7b9..44b9ad70a564 100644
    --- a/fs/nilfs2/sysfs.c
    +++ b/fs/nilfs2/sysfs.c
    @@ -208,9 +208,9 @@ int nilfs_sysfs_create_snapshot_group(struct nilfs_root *root)
    }

    if (err)
    - return err;
    + kobject_put(&root->snapshot_kobj);

    - return 0;
    + return err;
    }

    void nilfs_sysfs_delete_snapshot_group(struct nilfs_root *root)
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-09-14 01:07    [W:4.328 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site