erofs/zmap.c: Bail out when no further region remains
Subsystems (2)
RFC PATCH 1/1 erofs/zmap.c: Bail out when no further region remains
The following calculation of iomap->length on line 798 in z_erofs_iomap_begin_report() can yield 0:
if (iomap->offset >= inode->i_size) iomap->length = length + map.m_la - offset;
This triggers a WARN_ON in iomap_iter_done() (see line 34 of fs/iomap/iter.c).
Hence, return error when this scenario is encountered.
============================================================
This was reported as a crash by syzbot under an issue about warning encountered in iomap_iter_done(), but unrelated to erofs. Hence, not adding issue hash in Reported-by line.
C reproducer: https://syzkaller.appspot.com/text?tag=ReproC&x=1037a6b2880000
Kernel config: https://syzkaller.appspot.com/text?tag=KernelConfig&x=e2021a61197ebe02
Dashboard link: https://syzkaller.appspot.com/bug?extid=a8e049cd3abd342936b6
--- fs/erofs/zmap.c | 3 +++ 1 file changed, 3 insertions(+)
fs/erofs/zmap.c +3 -0
@@ -796,6 +796,9 @@ static int z_erofs_iomap_begin_report(struct inode *inode, loff_t offset,*/ if (iomap->offset >= inode->i_size) iomap->length = length + map.m_la - offset; + +if (iomap->length ==0 ) +return -EINVAL ; } iomap->flags =0 ;return 0 ;
Signature · 1 line
2.35.1
Quoted 31 lines · Siddh Raman Pant
The following calculation of
iomap->lengthon line 798 inz_erofs_iomap_begin_report()can yield 0:if (iomap->offset >= inode->i_size) iomap->length = length + map.m_la - offset;This triggers a
WARN_ONiniomap_iter_done()(see line 34 offs/iomap/iter.c).Hence, return error when this scenario is encountered.
============================================================
This was reported as a crash by syzbot under an issue about warning encountered in
iomap_iter_done(), but unrelated to erofs. Hence, not adding issue hash in Reported-by line.C reproducer: https://syzkaller.appspot.com/text?tag=ReproC&x=1037a6b2880000
Kernel config: https://syzkaller.appspot.com/text?tag=KernelConfig&x=e2021a61197ebe02
Dashboard link: https://syzkaller.appspot.com/bug?extid=a8e049cd3abd342936b6Reported-by [email protected]Signed-off-by Siddh Raman Pant <[email protected]>--- fs/erofs/zmap.c | 3 +++ 1 file changed, 3 insertions(+)fs/erofs/zmap.c +0
-0
fs/erofs/zmap.c static int z_erofs_iomap_begin_report(struct inode *inode, loff_t offset, · line 800
Quoted 5 lines
fs/erofs/zmap.c +2
-0@@ -796,6 +796,9 @@ static int z_erofs_iomap_begin_report(struct inode *inode, loff_t offset,*/ if (iomap->offset >= inode->i_size) iomap->length = length + map.m_la - offset; + +if (iomap->length ==0 )
I just wonder if we should return -EINVAL for post-EOF cases or IOMAP_HOLE with arbitrary length?
Thanks,
Gao Xiang
Quoted 7 lines
fs/erofs/zmap.c +1
-0+return -EINVAL ; } iomap->flags =0 ;return 0 ;Signature · 1 line
2.35.1
Quoted 2 lines · Gao Xiang
I just wonder if we should return
-EINVALfor post-EOF cases orIOMAP_HOLEwith arbitrary length?
Since it has been observed that length can be zeroed, and we must stop, I think we should return an error appropriately.
For a read-only filesystem, we probably don't really need to care what's after the EOF or in unmapped regions, nothing can be changed/extended. The definition of IOMAP_HOLE in iomap.h says it stands for "no blocks allocated, need allocation".
Alternatively, we can return error iff the length of the extent with holes is zero, like here.
Thanks,
Siddh
Quoted 11 lines · Siddh Raman Pant via Linux-erofs
Quoted 2 lines · Gao Xiang
I just wonder if we should return
-EINVALfor post-EOF cases orIOMAP_HOLEwith arbitrary length?Since it has been observed that length can be zeroed, and we must stop, I think we should return an error appropriately.
For a read-only filesystem, we probably don't really need to care what's after the EOF or in unmapped regions, nothing can be changed/extended. The definition of
IOMAP_HOLEiniomap.hsays it stands for "no blocks allocated, need allocation".
For fiemap implementation, yes. So it looks fine to me.
Let's see what other people think. Anyway, I'd like to apply it later.
Thanks,
Gao Xiang
Quoted 6 lines
Alternatively, we can return error iff the length of the extent with holes is zero, like here.
Thanks,
Siddh
Hi Siddh,
Quoted 8 lines · Gao Xiang
Quoted 7 lines · Siddh Raman Pant via Linux-erofs
Quoted 2 lines · Gao Xiang
I just wonder if we should return
-EINVALfor post-EOF cases orIOMAP_HOLEwith arbitrary length?Since it has been observed that length can be zeroed, and we must stop, I think we should return an error appropriately.
Quoted 9 lines
Quoted 4 lines
For a read-only filesystem, we probably don't really need to care what's after the EOF or in unmapped regions, nothing can be changed/extended. The definition of
IOMAP_HOLEiniomap.hsays it stands for "no blocks allocated, need allocation".For fiemap implementation, yes. So it looks fine to me.
Let's see what other people think. Anyway, I'd like to apply it later.
Very sorry for late response.
I've just confirmed that the reason is that
796 /*
797 * No strict rule how to describe extents for post EOF, yet 798 * we need do like below. Otherwise, iomap itself will get 799 * into an endless loop on post EOF. 800 */
801 if (iomap->offset >= inode->i_size)
802 iomap->length = length + map.m_la - offset;
Here iomap->length should be length + offset - map.m_la here. Because the extent start (map.m_la) is always no more than requested `offset'.
We should need this code sub-block since userspace (filefrag -v) could
pass
ioctl(3, FS_IOC_FIEMAP, {fm_start=0, fm_length=18446744073709551615, fm_flags=0, fm_extent_count=292} => {fm_flags=0, fm_mapped_extents=68, ...}) = 0
without this sub-block, fiemap could get into a very long loop as below:
[ 574.030856][ T7030] erofs: m_la 70000000 offset 70457397 length 9223372036784318410 m_llen 457398 [ 574.031622][ T7030] erofs: m_la 70000000 offset 70457398 length 9223372036784318409 m_llen 457399 [ 574.032397][ T7030] erofs: m_la 70000000 offset 70457399 length 9223372036784318408 m_llen 457400
So could you fix this as?
iomap->length = length + offset - map.m_la;
I've already verified it can properly resolve the issue and do the correct thing although I'd like to submit this later since we're quite close to the merge window.
Thanks,
Gao Xiang
Quoted 36 lines · Gao Xiang
Hi Siddh,
Quoted 8 lines · Gao Xiang
Quoted 7 lines · Siddh Raman Pant via Linux-erofs
Quoted 2 lines · Gao Xiang
I just wonder if we should return
-EINVALfor post-EOF cases orIOMAP_HOLEwith arbitrary length?Since it has been observed that length can be zeroed, and we must stop, I think we should return an error appropriately.
Quoted 9 lines
Quoted 4 lines
For a read-only filesystem, we probably don't really need to care what's after the EOF or in unmapped regions, nothing can be changed/extended. The definition of
IOMAP_HOLEiniomap.hsays it stands for "no blocks allocated, need allocation".For fiemap implementation, yes. So it looks fine to me.
Let's see what other people think. Anyway, I'd like to apply it later.
Very sorry for late response.
I've just confirmed that the reason is that
796 /*
797 * No strict rule how to describe extents for post EOF, yet 798 * we need do like below. Otherwise, iomap itself will get 799 * into an endless loop on post EOF. 800 */801 if (
iomap->offset>=inode->i_size)
802iomap->length= length + map.m_la - offset;Here
iomap->lengthshould be length + offset - map.m_la here. Because the extent start (map.m_la) is always no more than requested `offset'.
Quoted 8 lines
We should need this code sub-block since userspace (filefrag -v) could
pass
ioctl(3,FS_IOC_FIEMAP, {fm_start=0, fm_length=18446744073709551615, fm_flags=0, fm_extent_count=292} => {fm_flags=0, fm_mapped_extents=68, ...}) = 0without this sub-block, fiemap could get into a very long loop as below:
[ 574.030856][ T7030] erofs: m_la 70000000 offset 70457397 length 9223372036784318410 m_llen 457398 [ 574.031622][ T7030] erofs: m_la 70000000 offset 70457398 length 9223372036784318409 m_llen 457399 [ 574.032397][ T7030] erofs: m_la 70000000 offset 70457399 length 9223372036784318408 m_llen 457400
Thanks for the detailed explanation!
Quoted 9 lines
So could you fix this as?
iomap->length = length + offset - map.m_la;I've already verified it can properly resolve the issue and do the correct thing although I'd like to submit this later since we're quite close to the merge window.
Thanks,
Gao Xiang
Sure, I'll send the patch for now, which can be merged after the window.
Thanks,
Siddh