lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ext4: make ext4_ext_convert_to_initialized() return proper number of blocks

Browse Source 
ext4_ext_convert_to_initialized() can return more blocks than are
actually allocated from map->m_lblk in case where initial part of the
on-disk extent is zeroed out. Luckily this doesn't have serious
consequences because the caller currently uses the return value
only to unmap metadata buffers. Anyway this is a data
corruption/exposure problem waiting to happen so fix it.

Coverity-id: 1226848
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Jan Kara
2014-10-30 10:53:17 -04:00
committed by Theodore Ts'o
parent 4f879ca687
commit ae9e9c6aee
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fs/ext4/extents.c
View File

@@ -3603,11 +3603,10 @@ static int ext4_ext_convert_to_initialized(handle_t *handle,
} }
} }
allocated = ext4_split_extent(handle, inode, ppath, err = ext4_split_extent(handle, inode, ppath, &split_map, split_flag,
&split_map, split_flag, flags); flags);
if (allocated < 0) if (err > 0)
err = allocated; err = 0;
out: out:
/* If we have gotten a failure, don't zero out status tree */ /* If we have gotten a failure, don't zero out status tree */
if (!err) if (!err)