ubifs: ubifs_add_orphan: Fix a memory leak bug
authorZhihao Cheng <chengzhihao1@huawei.com>
Tue, 3 Mar 2020 09:40:23 +0000 (17:40 +0800)
committerRichard Weinberger <richard@nod.at>
Mon, 30 Mar 2020 21:02:30 +0000 (23:02 +0200)
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>
fs/ubifs/orphan.c

index 7dd740e..283f9eb 100644 (file)
@@ -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;
 }