lkml.org 
[lkml]   [2020]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 218/330] ubifs: ubifs_add_orphan: Fix a memory leak bug
    Date
    From: Zhihao Cheng <chengzhihao1@huawei.com>

    [ Upstream commit 927cc5cec35f01fe4f8af0ba80830a90b0533983 ]

    Memory leak occurs when files with extended attributes are added to
    orphan list.

    Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
    Fixes: 988bec41318f3fa897e2f8 ("ubifs: orphan: Handle xattrs like files")
    Signed-off-by: Richard Weinberger <richard@nod.at>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/ubifs/orphan.c | 9 +++++++--
    1 file changed, 7 insertions(+), 2 deletions(-)

    diff --git a/fs/ubifs/orphan.c b/fs/ubifs/orphan.c
    index 7dd740e3692da..283f9eb48410d 100644
    --- a/fs/ubifs/orphan.c
    +++ b/fs/ubifs/orphan.c
    @@ -157,7 +157,7 @@ int ubifs_add_orphan(struct ubifs_info *c, ino_t inum)
    int err = 0;
    ino_t xattr_inum;
    union ubifs_key key;
    - struct ubifs_dent_node *xent;
    + struct ubifs_dent_node *xent, *pxent = NULL;
    struct fscrypt_name nm = {0};
    struct ubifs_orphan *xattr_orphan;
    struct ubifs_orphan *orphan;
    @@ -181,11 +181,16 @@ int ubifs_add_orphan(struct ubifs_info *c, ino_t inum)
    xattr_inum = le64_to_cpu(xent->inum);

    xattr_orphan = orphan_add(c, xattr_inum, orphan);
    - if (IS_ERR(xattr_orphan))
    + if (IS_ERR(xattr_orphan)) {
    + kfree(xent);
    return PTR_ERR(xattr_orphan);
    + }

    + kfree(pxent);
    + pxent = xent;
    key_read(c, &xent->key, &key);
    }
    + kfree(pxent);

    return 0;
    }
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-09-18 05:01    [W:2.514 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site