lkml.org 
[lkml]   [2016]   [Sep]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 149/192] ext4: properly align shifted xattrs when expanding inodes
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Jan Kara <jack@suse.cz>

    commit 443a8c41cd49de66a3fda45b32b9860ea0292b84 upstream.

    We did not count with the padding of xattr value when computing desired
    shift of xattrs in the inode when expanding i_extra_isize. As a result
    we could create unaligned start of inline xattrs. Account for alignment
    properly.

    Signed-off-by: Jan Kara <jack@suse.cz>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/ext4/xattr.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/fs/ext4/xattr.c
    +++ b/fs/ext4/xattr.c
    @@ -1429,7 +1429,7 @@ retry:
    if (entry_size + EXT4_XATTR_SIZE(size) >= isize_diff)
    shift_bytes = isize_diff;
    else
    - shift_bytes = entry_size + size;
    + shift_bytes = entry_size + EXT4_XATTR_SIZE(size);
    /* Adjust the offsets and shift the remaining entries ahead */
    ext4_xattr_shift_entries(entry, -shift_bytes,
    (void *)raw_inode + EXT4_GOOD_OLD_INODE_SIZE +

    \
     
     \ /
      Last update: 2016-09-17 09:59    [W:3.175 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site