lkml.org 
[lkml]   [2013]   [Jul]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 16/18] ext4: fix overflow when counting used blocks on 32-bit architectures
    Date
    3.0-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jan Kara <jack@suse.cz>

    commit 8af8eecc1331dbf5e8c662022272cf667e213da5 upstream.

    The arithmetics adding delalloc blocks to the number of used blocks in
    ext4_getattr() can easily overflow on 32-bit archs as we first multiply
    number of blocks by blocksize and then divide back by 512. Make the
    arithmetics more clever and also use proper type (unsigned long long
    instead of unsigned long).

    Signed-off-by: Jan Kara <jack@suse.cz>
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/ext4/inode.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/fs/ext4/inode.c
    +++ b/fs/ext4/inode.c
    @@ -5481,7 +5481,7 @@ int ext4_getattr(struct vfsmount *mnt, s
    struct kstat *stat)
    {
    struct inode *inode;
    - unsigned long delalloc_blocks;
    + unsigned long long delalloc_blocks;

    inode = dentry->d_inode;
    generic_fillattr(inode, stat);
    @@ -5498,7 +5498,7 @@ int ext4_getattr(struct vfsmount *mnt, s
    */
    delalloc_blocks = EXT4_I(inode)->i_reserved_data_blocks;

    - stat->blocks += (delalloc_blocks << inode->i_sb->s_blocksize_bits)>>9;
    + stat->blocks += delalloc_blocks << (inode->i_sb->s_blocksize_bits-9);
    return 0;
    }




    \
     
     \ /
      Last update: 2013-07-19 07:02    [W:5.966 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site