Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ext2: Fix fs corruption in ext2_get_xip_mem()

Commit 8e3dffc651cb "Ext2: mark inode dirty after the function
dquot_free_block_nodirty is called" unveiled a bug in __ext2_get_block()
called from ext2_get_xip_mem(). That function called ext2_get_block()
mistakenly asking it to map 0 blocks while 1 was intended. Before the
above mentioned commit things worked out fine by luck but after that commit
we started returning that we allocated 0 blocks while we in fact
allocated 1 block and thus allocation was looping until all blocks in
the filesystem were exhausted.

Fix the problem by properly asking for one block and also add assertion
in ext2_get_blocks() to catch similar problems.

Reported-and-tested-by: Andiry Xu <andiry.xu@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>

Jan Kara 7ba3ec57 18da65e7

+3
+2
fs/ext2/inode.c
··· 632 632 int count = 0; 633 633 ext2_fsblk_t first_block = 0; 634 634 635 + BUG_ON(maxblocks == 0); 636 + 635 637 depth = ext2_block_to_path(inode,iblock,offsets,&blocks_to_boundary); 636 638 637 639 if (depth == 0)
+1
fs/ext2/xip.c
··· 35 35 int rc; 36 36 37 37 memset(&tmp, 0, sizeof(struct buffer_head)); 38 + tmp.b_size = 1 << inode->i_blkbits; 38 39 rc = ext2_get_block(inode, pgoff, &tmp, create); 39 40 *result = tmp.b_blocknr; 40 41