| From foo@baz Tue Mar 12 05:46:41 PDT 2019 |
| From: Gao Xiang <gaoxiang25@huawei.com> |
| Date: Mon, 11 Mar 2019 14:08:56 +0800 |
| Subject: staging: erofs: fix memleak of inode's shared xattr array |
| To: <stable@vger.kernel.org> |
| Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, LKML <linux-kernel@vger.kernel.org>, <linux-erofs@lists.ozlabs.org>, Chao Yu <yuchao0@huawei.com>, Chao Yu <chao@kernel.org>, Miao Xie <miaoxie@huawei.com>, Fang Wei <fangwei1@huawei.com>, Sheng Yong <shengyong1@huawei.com>, Gao Xiang <gaoxiang25@huawei.com> |
| Message-ID: <20190311060858.28654-3-gaoxiang25@huawei.com> |
| |
| From: Gao Xiang <gaoxiang25@huawei.com> |
| |
| From: Sheng Yong <shengyong1@huawei.com> |
| |
| 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: Gao Xiang <gaoxiang25@huawei.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/staging/erofs/xattr.c | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/staging/erofs/xattr.c |
| +++ b/drivers/staging/erofs/xattr.c |
| @@ -109,8 +109,11 @@ static int init_inode_xattrs(struct inod |
| |
| it.page = erofs_get_meta_page(inode->i_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; |
