UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: erofs: cannot set EROFS_V_Z_INITED_BIT if fill_inode_lazy fails 

As reported by erofs-utils fuzzer, unsupported compressed
clustersize will make fill_inode_lazy fail, for such case
we cannot set EROFS_V_Z_INITED_BIT since we need return
failure for each z_erofs_map_blocks_iter().

Fixes: 152a333a58 ("staging: erofs: add compacted compression indexes support")
Cc: <stable@vger.kernel.org> # 5.3+
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Link: https://lore.kernel.org/r/20190819103426.87579-3-gaoxiang25@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Gao Xiang 2019-08-19 18:34:22 +08:00 committed by Greg Kroah-Hartman
parent ee45197c80
commit 3407a4198f
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/erofs/zmap.c
View File

@ -85,12 +85,11 @@ static int fill_inode_lazy(struct inode *inode)
vi->z_physical_clusterbits[1] = vi->z_logical_clusterbits + vi->z_physical_clusterbits[1] = vi->z_logical_clusterbits +
((h->h_clusterbits >> 5) & 7); ((h->h_clusterbits >> 5) & 7);
set_bit(EROFS_V_Z_INITED_BIT, &vi->flags);
unmap_done: unmap_done:
kunmap_atomic(kaddr); kunmap_atomic(kaddr);
unlock_page(page); unlock_page(page);
put_page(page); put_page(page);
set_bit(EROFS_V_Z_INITED_BIT, &vi->flags);
out_unlock: out_unlock:
clear_and_wake_up_bit(EROFS_V_BL_Z_BIT, &vi->flags); clear_and_wake_up_bit(EROFS_V_BL_Z_BIT, &vi->flags);
return err; return err;