erofs: fix general protection fault when reading fragment
Yue Hu
reviewerPATCH 1/1 erofs: fix general protection fault when reading fragment
From: Yue Hu <[email protected]>
As syzbot reported [1], the fragment feature sb flag is not set, so packed_inode != NULL needs to be checked in z_erofs_read_fragment().
[1] https://lore.kernel.org/all/[email protected]/
Reported-by [email protected]
Fixes 08a0c9ef3e7e ("erofs: support on-disk compressed fragments data")
Signed-off-by Yue Hu <[email protected]>
--- fs/erofs/zdata.c | 3 +++ 1 file changed, 3 insertions(+)
fs/erofs/zdata.c +3 -0
@@ -659,6 +659,9 @@ static int z_erofs_read_fragment(struct inode *inode, erofs_off_t pos,u8 *src, *dst;unsigned int i, cnt; +if (!packed_inode) +return -EFAULT ; + pos +=EROFS_I (inode)->z_fragmentoff;for (i =0 ; i < len; i += cnt) { cnt = min_t(unsigned int, len - i,
Signature · 1 line
2.17.1
Quoted 19 lines · Yue Hu
From: Yue Hu <[email protected]>
As syzbot reported [1], the fragment feature sb flag is not set, so
packed_inode!= NULL needs to be checked inz_erofs_read_fragment().[1] https://lore.kernel.org/all/[email protected]/
Reported-by [email protected]Fixes 08a0c9ef3e7e ("erofs: support on-disk compressed fragments data")Signed-off-by Yue Hu <[email protected]>--- fs/erofs/zdata.c | 3 +++ 1 file changed, 3 insertions(+)fs/erofs/zdata.c +0
-0
fs/erofs/zdata.c static int z_erofs_read_fragment(struct inode *inode, erofs_off_t pos, · line 663
Quoted 5 lines
fs/erofs/zdata.c +2
-0@@ -659,6 +659,9 @@ static int z_erofs_read_fragment(struct inode *inode, erofs_off_t pos,u8 *src, *dst;unsigned int i, cnt; +if (!packed_inode) +return -EFAULT ;
You should use -EFSCURRUPTED; here.
Thanks,
Gao Xiang
Quoted 6 lines
fs/erofs/zdata.c +1
-0+ pos +=EROFS_I (inode)->z_fragmentoff;for (i =0 ; i < len; i += cnt) { cnt = min_t(unsigned int, len - i,Signature · 1 line
2.17.1