summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSheng Yong <shengyong1@huawei.com>2019-02-14 14:46:36 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-03-10 07:08:58 +0100
commit6df0b3ebdade371d94663353654fa6d6f0d1ca1a (patch)
treedc9b217143fe126b6c816f41550c18c18d5a1158
parent27f2f4877a004fa0360d63b8c5baa3ec90e6f022 (diff)
downloadtalos-obmc-linux-6df0b3ebdade371d94663353654fa6d6f0d1ca1a.tar.gz
talos-obmc-linux-6df0b3ebdade371d94663353654fa6d6f0d1ca1a.zip
staging: erofs: fix memleak of inode's shared xattr array
commit 3b1b5291f79d040d549d7c746669fc30e8045b9b upstream. If it fails to read a shared xattr page, the inode's shared xattr array is not freed. The next time the inode's xattr is accessed, the previously allocated array is leaked. Signed-off-by: Sheng Yong <shengyong1@huawei.com> Fixes: b17500a0fdba ("staging: erofs: introduce xattr & acl support") Cc: <stable@vger.kernel.org> # 4.19+ Reviewed-by: Gao Xiang <gaoxiang25@huawei.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/erofs/xattr.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/staging/erofs/xattr.c b/drivers/staging/erofs/xattr.c
index e30de2476fd0..04eb75bbe9a3 100644
--- a/drivers/staging/erofs/xattr.c
+++ b/drivers/staging/erofs/xattr.c
@@ -111,8 +111,11 @@ static int init_inode_xattrs(struct inode *inode)
it.page = erofs_get_meta_page(sb,
++it.blkaddr, S_ISDIR(inode->i_mode));
- if (IS_ERR(it.page))
+ if (IS_ERR(it.page)) {
+ kfree(vi->xattr_shared_xattrs);
+ vi->xattr_shared_xattrs = NULL;
return PTR_ERR(it.page);
+ }
it.kaddr = kmap_atomic(it.page);
atomic_map = true;
OpenPOWER on IntegriCloud