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 13/16] nilfs2: fix memory leak in nilfs_sysfs_create_##name##_group
    Date
    From: Nanyong Sun <sunnanyong@huawei.com>

    [ Upstream commit 24f8cb1ed057c840728167dab33b32e44147c86f ]

    If kobject_init_and_add return 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-4-sunnanyong@huawei.com
    Link: https://lkml.kernel.org/r/1625651306-10829-4-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 43f660beb9b4..5dc468ff5903 100644
    --- a/fs/nilfs2/sysfs.c
    +++ b/fs/nilfs2/sysfs.c
    @@ -92,8 +92,8 @@ static int nilfs_sysfs_create_##name##_group(struct the_nilfs *nilfs) \
    err = kobject_init_and_add(kobj, &nilfs_##name##_ktype, parent, \
    #name); \
    if (err) \
    - return err; \
    - return 0; \
    + kobject_put(kobj); \
    + return err; \
    } \
    static void nilfs_sysfs_delete_##name##_group(struct the_nilfs *nilfs) \
    { \
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-09-14 00:40    [W:4.650 / U:0.200 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site