Skip to content

Commit 29e9518

Browse files
hsiangkaogregkh
authored andcommitted
erofs: ensure m_llen is reset to 0 if metadata is invalid
[ Upstream commit 9b32b06 ] Sometimes, the on-disk metadata might be invalid due to user interrupts, storage failures, or other unknown causes. In that case, z_erofs_map_blocks_iter() may still return a valid m_llen while other fields remain invalid (e.g., m_plen can be 0). Due to the return value of z_erofs_scan_folio() in some path will be ignored on purpose, the following z_erofs_scan_folio() could then use the invalid value by accident. Let's reset m_llen to 0 to prevent this. Link: https://lore.kernel.org/r/20240629185743.2819229-1-hsiangkao@linux.alibaba.com Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 3b73244 commit 29e9518

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

fs/erofs/zmap.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -723,6 +723,8 @@ int z_erofs_map_blocks_iter(struct inode *inode, struct erofs_map_blocks *map,
723723

724724
err = z_erofs_do_map_blocks(inode, map, flags);
725725
out:
726+
if (err)
727+
map->m_llen = 0;
726728
trace_z_erofs_map_blocks_iter_exit(inode, map, flags, err);
727729
return err;
728730
}

0 commit comments

Comments
 (0)