diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2014-01-07 12:58:19 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-06 11:08:16 -0800 |
| commit | 209bd086e423d98ddf2fd52a6f1afda15b5758b1 (patch) | |
| tree | c60f41a3bab6b4077e1216aed4ceab2b294c9670 /fs/ext4 | |
| parent | f07b772da47ad954573b1ffe6ebd4df1b59bf656 (diff) | |
| download | linux-3.10-209bd086e423d98ddf2fd52a6f1afda15b5758b1.tar.gz linux-3.10-209bd086e423d98ddf2fd52a6f1afda15b5758b1.tar.bz2 linux-3.10-209bd086e423d98ddf2fd52a6f1afda15b5758b1.zip | |
ext4: avoid clearing beyond i_blocks when truncating an inline data file
commit 09c455aaa8f47a94d5bafaa23d58365768210507 upstream.
A missing cast means that when we are truncating a file which is less
than 60 bytes, we don't clear the correct area of memory, and in fact
we can end up truncating the next inode in the inode table, or worse
yet, some other kernel data structure.
Addresses-Coverity-Id: #751987
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/inline.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index 33331b4c217..e350be6c7ac 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -1957,9 +1957,11 @@ void ext4_inline_data_truncate(struct inode *inode, int *has_inline) } /* Clear the content within i_blocks. */ - if (i_size < EXT4_MIN_INLINE_DATA_SIZE) - memset(ext4_raw_inode(&is.iloc)->i_block + i_size, 0, - EXT4_MIN_INLINE_DATA_SIZE - i_size); + if (i_size < EXT4_MIN_INLINE_DATA_SIZE) { + void *p = (void *) ext4_raw_inode(&is.iloc)->i_block; + memset(p + i_size, 0, + EXT4_MIN_INLINE_DATA_SIZE - i_size); + } EXT4_I(inode)->i_inline_size = i_size < EXT4_MIN_INLINE_DATA_SIZE ? |