Commit 56809722 authored by Jan Kara's avatar Jan Kara Committed by Ben Hutchings

ext4: fix data corruption in data=journal mode

commit 3b136499 upstream.

ext4_journalled_write_end() did not propely handle all the cases when
generic_perform_write() did not copy all the data into the target page
and could mark buffers with uninitialized contents as uptodate and dirty
leading to possible data corruption (which would be quickly fixed by
generic_perform_write() retrying the write but still). Fix the problem
by carefully handling the case when the page that is written to is not
uptodate.
Reported-by: default avatarAl Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent ec7d1dbf
...@@ -1073,7 +1073,9 @@ static int ext4_writeback_write_end(struct file *file, ...@@ -1073,7 +1073,9 @@ static int ext4_writeback_write_end(struct file *file,
* set the buffer to be dirty, since in data=journalled mode we need * set the buffer to be dirty, since in data=journalled mode we need
* to call ext4_handle_dirty_metadata() instead. * to call ext4_handle_dirty_metadata() instead.
*/ */
static void zero_new_buffers(struct page *page, unsigned from, unsigned to) static void ext4_journalled_zero_new_buffers(handle_t *handle,
struct page *page,
unsigned from, unsigned to)
{ {
unsigned int block_start = 0, block_end; unsigned int block_start = 0, block_end;
struct buffer_head *head, *bh; struct buffer_head *head, *bh;
...@@ -1090,7 +1092,7 @@ static void zero_new_buffers(struct page *page, unsigned from, unsigned to) ...@@ -1090,7 +1092,7 @@ static void zero_new_buffers(struct page *page, unsigned from, unsigned to)
size = min(to, block_end) - start; size = min(to, block_end) - start;
zero_user(page, start, size); zero_user(page, start, size);
set_buffer_uptodate(bh); write_end_fn(handle, bh);
} }
clear_buffer_new(bh); clear_buffer_new(bh);
} }
...@@ -1118,16 +1120,19 @@ static int ext4_journalled_write_end(struct file *file, ...@@ -1118,16 +1120,19 @@ static int ext4_journalled_write_end(struct file *file,
BUG_ON(!ext4_handle_valid(handle)); BUG_ON(!ext4_handle_valid(handle));
if (copied < len) { if (unlikely(copied < len) && !PageUptodate(page)) {
if (!PageUptodate(page))
copied = 0; copied = 0;
zero_new_buffers(page, from+copied, to); ext4_journalled_zero_new_buffers(handle, page, from, to);
} } else {
if (unlikely(copied < len))
ext4_journalled_zero_new_buffers(handle, page,
from + copied, to);
ret = walk_page_buffers(handle, page_buffers(page), from, ret = walk_page_buffers(handle, page_buffers(page), from,
to, &partial, write_end_fn); from + copied, &partial,
write_end_fn);
if (!partial) if (!partial)
SetPageUptodate(page); SetPageUptodate(page);
}
new_i_size = pos + copied; new_i_size = pos + copied;
if (new_i_size > inode->i_size) if (new_i_size > inode->i_size)
i_size_write(inode, pos+copied); i_size_write(inode, pos+copied);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment