GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-03-30 19:15:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ext2: fix block range in ext2_data_block_valid()

Browse source 
For block validity we should check the block range
from start_block to start_block + count - 1, so fix
the range in ext2_data_block_valid() and also modify
the count argument properly in calling place.

Signed-off-by: Chengguang Xu <cgxu519@zoho.com.cn>
Link: https://lore.kernel.org/r/20190723112155.20329-1-cgxu519@zoho.com.cn
Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Chengguang Xu 2019-07-23 19:21:54 +08:00 • committed by Jan Kara
parent 6fbacb8539
commit e5d395974e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/ext2/balloc.c
View file

@ -1203,13 +1203,13 @@ int ext2_data_block_valid(struct ext2_sb_info *sbi, ext2_fsblk_t start_blk,
unsigned int count) unsigned int count)
{ {
if ((start_blk <= le32_to_cpu(sbi->s_es->s_first_data_block)) || if ((start_blk <= le32_to_cpu(sbi->s_es->s_first_data_block)) ||
(start_blk + count < start_blk) || (start_blk + count - 1 < start_blk) ||
(start_blk > le32_to_cpu(sbi->s_es->s_blocks_count))) (start_blk + count - 1 >= le32_to_cpu(sbi->s_es->s_blocks_count)))
return 0; return 0;
/* Ensure we do not step over superblock */ /* Ensure we do not step over superblock */
if ((start_blk <= sbi->s_sb_block) && if ((start_blk <= sbi->s_sb_block) &&
(start_blk + count >= sbi->s_sb_block)) (start_blk + count - 1 >= sbi->s_sb_block))
return 0; return 0;
return 1; return 1;

2
fs/ext2/xattr.c
View file

@ -794,7 +794,7 @@ ext2_xattr_delete_inode(struct inode *inode)
if (!EXT2_I(inode)->i_file_acl) if (!EXT2_I(inode)->i_file_acl)
goto cleanup; goto cleanup;
if (!ext2_data_block_valid(sbi, EXT2_I(inode)->i_file_acl, 0)) { if (!ext2_data_block_valid(sbi, EXT2_I(inode)->i_file_acl, 1)) {
ext2_error(inode->i_sb, "ext2_xattr_delete_inode", ext2_error(inode->i_sb, "ext2_xattr_delete_inode",
"inode %ld: xattr block %d is out of data blocks range", "inode %ld: xattr block %d is out of data blocks range",
inode->i_ino, EXT2_I(inode)->i_file_acl); inode->i_ino, EXT2_I(inode)->i_file_acl);