evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libfs: Fix shift bug in generic_check_addressable()

Browse source 
generic_check_addressable() erroneously shifts pages down by a block
factor when it should be shifting up.  To prevent overflow, we shift
blocks down to pages.

Signed-off-by: Joel Becker <joel.becker@oracle.com>
This commit is contained in:
Joel Becker 2010-08-16 12:10:17 -07:00
parent 3bdb8efd94
commit a33f13efe0
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs/libfs.c
View file

@ -925,6 +925,8 @@ EXPORT_SYMBOL(generic_file_fsync);
int generic_check_addressable(unsigned blocksize_bits, u64 num_blocks) int generic_check_addressable(unsigned blocksize_bits, u64 num_blocks)
{ {
u64 last_fs_block = num_blocks - 1; u64 last_fs_block = num_blocks - 1;
u64 last_fs_page =
last_fs_block >> (PAGE_CACHE_SHIFT - blocksize_bits);
if (unlikely(num_blocks == 0)) if (unlikely(num_blocks == 0))
return 0; return 0;
@ -932,10 +934,8 @@ int generic_check_addressable(unsigned blocksize_bits, u64 num_blocks)
if ((blocksize_bits < 9) || (blocksize_bits > PAGE_CACHE_SHIFT)) if ((blocksize_bits < 9) || (blocksize_bits > PAGE_CACHE_SHIFT))
return -EINVAL; return -EINVAL;
if ((last_fs_block > if ((last_fs_block > (sector_t)(~0ULL) >> (blocksize_bits - 9)) ||
(sector_t)(~0ULL) >> (blocksize_bits - 9)) || (last_fs_page > (pgoff_t)(~0ULL))) {
(last_fs_block >
(pgoff_t)(~0ULL) >> (PAGE_CACHE_SHIFT - blocksize_bits))) {
return -EFBIG; return -EFBIG;
} }
return 0; return 0;