On Tue 07-01-14 12:57:17, Ted Tso wrote:
> A missing cast means that when we are truncating a file which is less
> than 60 bytes, we don't trunate the wrong 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.
Looks good (after updating the changelog as you suggested). You can add:
Reviewed-by: Jan Kara <jack@xxxxxxx>
Honza
>
> Addresses-Coverity-Id: #751987
>
> Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx>
> Cc: stable@xxxxxxxxxxxxxxx
> ---
> fs/ext4/inline.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
> index c417e52..ed29e72 100644
> --- a/fs/ext4/inline.c
> +++ b/fs/ext4/inline.c
> @@ -1928,9 +1928,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 ?
> --
> 1.8.5.rc3.362.gdf10213
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Jan Kara <jack@xxxxxxx>
SUSE Labs, CR
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
