[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20221205034957.90362-1-chenzhongjin@huawei.com>
Date: Mon, 5 Dec 2022 11:49:57 +0800
From: Chen Zhongjin <chenzhongjin@...wei.com>
To: <syzbot+6f8cd9a0155b366d227f@...kaller.appspotmail.com>,
<linux-erofs@...ts.ozlabs.org>, <linux-kernel@...r.kernel.org>
CC: <chenzhongjin@...wei.com>, <xiang@...nel.org>, <chao@...nel.org>,
<huyue2@...lpad.com>, <jefflexu@...ux.alibaba.com>
Subject: [PATCH -next v3] erofs: Fix pcluster memleak when its block address is zero
syzkaller reported a memleak:
https://syzkaller.appspot.com/bug?id=62f37ff612f0021641eda5b17f056f1668aa9aed
unreferenced object 0xffff88811009c7f8 (size 136):
...
backtrace:
[<ffffffff821db19b>] z_erofs_do_read_page+0x99b/0x1740
[<ffffffff821dee9e>] z_erofs_readahead+0x24e/0x580
[<ffffffff814bc0d6>] read_pages+0x86/0x3d0
...
syzkaller constructed a case: in z_erofs_register_pcluster(),
ztailpacking = false and map->m_pa = zero. This makes pcl->obj.index be
zero although pcl is not a inline pcluster.
Then following path adds refcount for grp, but the refcount won't be put
because pcl is inline.
z_erofs_readahead()
z_erofs_do_read_page() # for another page
z_erofs_collector_begin()
erofs_find_workgroup()
erofs_workgroup_get()
Since it's illegal for the block address of a pcluster to be zero, add
check here to avoid registering the pcluster which would be leaked.
Fixes: cecf864d3d76 ("erofs: support inline data decompression")
Reported-by: syzbot+6f8cd9a0155b366d227f@...kaller.appspotmail.com
Signed-off-by: Chen Zhongjin <chenzhongjin@...wei.com>
---
v1 -> v2:
As Gao's advice, we should fail to register pcluster if m_pa is zero.
Maked it this way and changed the commit message.
v2 -> v3:
Slightly fix commit message and add -next tag.
---
fs/erofs/zdata.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c
index b792d424d774..7826634f4f51 100644
--- a/fs/erofs/zdata.c
+++ b/fs/erofs/zdata.c
@@ -488,7 +488,8 @@ static int z_erofs_register_pcluster(struct z_erofs_decompress_frontend *fe)
struct erofs_workgroup *grp;
int err;
- if (!(map->m_flags & EROFS_MAP_ENCODED)) {
+ if (!(map->m_flags & EROFS_MAP_ENCODED) ||
+ !(map->m_pa >> PAGE_SHIFT)) {
DBG_BUGON(1);
return -EFSCORRUPTED;
}
--
2.17.1
Powered by blists - more mailing lists