nilfs2: reject zero bd_oblocknr in nilfs_ioctl_mark_blocks_dirty()
Ryusuke Konishi
maintainerPATCH 1/1 nilfs2: reject zero bd_oblocknr in nilfs_ioctl_mark_blocks_dirty()
From: Deepanshu Kartikey <[email protected]>
nilfs_ioctl_mark_blocks_dirty() uses bd_oblocknr to detect dead blocks by comparing it with the current block number bd_blocknr. If they differ, the block is considered dead and skipped.
However, bd_oblocknr should never be 0 since block 0 typically stores the primary superblock and is never a valid GC target block. A corrupted ioctl request with bd_oblocknr set to 0 causes the comparison to incorrectly match when the lookup returns -ENOENT and sets bd_blocknr to 0, bypassing the dead block check and calling nilfs_bmap_mark() on a non-existent block. This causes nilfs_btree_do_lookup() to return -ENOENT, triggering the WARN_ON(ret == -ENOENT).
Fix this by rejecting ioctl requests with bd_oblocknr set to 0 at the beginning of each iteration.
[ryusuke: slightly modified the commit message and comments for accuracy]
---
Hi Viacheslav,
Please add this to the queue for the next cycle. This fixes assertion failures that can occur with broken GC ioctl calls recently discovered by syzbot.
Thanks,
Ryusuke Konishi
fs/nilfs2/ioctl.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/nilfs2/ioctl.c +6 -0
@@ -736,6 +736,12 @@ static int nilfs_ioctl_mark_blocks_dirty(struct the_nilfs *nilfs,int ret, i;for (i =0 ; i < nmembs; i++) { +/* +* bd_oblocknr must never be 0 as block 0 +* is never a valid GC target block +*/ +if (unlikely (!bdescs[i].bd_oblocknr)) +return -EINVAL ;/* XXX: use macro or inline func to check liveness */ ret = nilfs_bmap_lookup_at_level(bmap, bdescs[i].bd_offset,
Signature · 1 line
2.43.0
Hi Ryusuke,
Quoted 48 lines · Ryusuke Konishi
From: Deepanshu Kartikey <[email protected]>
nilfs_ioctl_mark_blocks_dirty()usesbd_oblocknrto detect dead blocks by comparing it with the current block numberbd_blocknr. If they differ, the block is considered dead and skipped.However,
bd_oblocknrshould never be 0 since block 0 typically stores the primary superblock and is never a valid GC target block. A corrupted ioctl request withbd_oblocknrset to 0 causes the comparison to incorrectly match when the lookup returns-ENOENTand setsbd_blocknrto 0, bypassing the dead block check and callingnilfs_bmap_mark()on a non-existent block. This causesnilfs_btree_do_lookup()to return-ENOENT, triggering theWARN_ON(ret == -ENOENT).Fix this by rejecting ioctl requests with
bd_oblocknrset to 0 at the beginning of each iteration.[ryusuke: slightly modified the commit message and comments for accuracy]
Fixes 7942b919f732 ("nilfs2: ioctl operations")Reported-by [email protected]Suggested-by Ryusuke Konishi <[email protected]>Signed-off-by Deepanshu Kartikey <[email protected]>Reported-by [email protected]Cc Junjie Cao <[email protected]>Signed-off-by Ryusuke Konishi <[email protected]>---
Hi Viacheslav,Please add this to the queue for the next cycle. This fixes assertion failures that can occur with broken GC ioctl calls recently discovered by syzbot.
Thanks,
Ryusuke Konishifs/nilfs2/ioctl.c | 6 ++++++ 1 file changed, 6 insertions(+)fs/nilfs2/ioctl.c +0
-0@@ -736,6 +736,12 @@ static int nilfs_ioctl_mark_blocks_dirty(struct the_nilfs *nilfs,int ret, i;
fs/nilfs2/ioctl.c static int nilfs_ioctl_mark_blocks_dirty(struct the_nilfs *nilfs, · line 747
Quoted 10 lines
fs/nilfs2/ioctl.c +6
-0for (i =0 ; i < nmembs; i++) { +/* +* bd_oblocknr must never be 0 as block 0 +* is never a valid GC target block +*/ +if (unlikely (!bdescs[i].bd_oblocknr)) +return -EINVAL ;/* XXX: use macro or inline func to check liveness */ ret = nilfs_bmap_lookup_at_level(bmap, bdescs[i].bd_offset,
Applied on for-next branch of NILFS2 git tree.
Thanks,
Slava.