redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

Minor fix for btrfs_csum_file_block.

Browse source 
Execution should goto label 'insert' when 'btrfs_next_leaf' return a
non-zero value, otherwise the parameter 'slot' for
'btrfs_item_key_to_cpu' may be out of bounds. The original codes jump
to  label 'insert' only when 'btrfs_next_leaf' return a negative
value.

Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Yan 2007-10-29 12:01:05 -04:00 committed by Chris Mason
parent 689f934661
commit b56baf5bed
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fs/btrfs/file-item.c
View file

@ -178,13 +178,11 @@ int btrfs_csum_file_block(struct btrfs_trans_handle *trans,
nritems = btrfs_header_nritems(path->nodes[0]); nritems = btrfs_header_nritems(path->nodes[0]);
if (path->slots[0] >= nritems - 1) { if (path->slots[0] >= nritems - 1) {
ret = btrfs_next_leaf(root, path); ret = btrfs_next_leaf(root, path);
if (ret == 1) { if (ret == 1)
found_next = 1; found_next = 1;
} else if (ret == 0) { if (ret != 0)
slot = 0;
} else {
goto insert; goto insert;
} slot = 0;
} }
btrfs_item_key_to_cpu(path->nodes[0], &found_key, slot); btrfs_item_key_to_cpu(path->nodes[0], &found_key, slot);
if (found_key.objectid != objectid || if (found_key.objectid != objectid ||
@ -238,7 +236,7 @@ insert:
csum_offset = 0; csum_offset = 0;
if (found_next) { if (found_next) {
u64 tmp = min((u64)i_size_read(inode), next_offset); u64 tmp = min((u64)i_size_read(inode), next_offset);
tmp -= offset + root->sectorsize - 1; tmp -= offset & ~((u64)root->sectorsize -1);
tmp >>= root->fs_info->sb->s_blocksize_bits; tmp >>= root->fs_info->sb->s_blocksize_bits;
tmp = max((u64)1, tmp); tmp = max((u64)1, tmp);
tmp = min(tmp, (u64)MAX_CSUM_ITEMS(root)); tmp = min(tmp, (u64)MAX_CSUM_ITEMS(root));