diff options
| author | Jan Kara <jack@suse.cz> | 2014-10-22 15:21:47 +0200 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2014-11-03 16:07:37 -0800 |
| commit | 9234f3190bf8b25b11b105191d408ac50a107948 (patch) | |
| tree | d53dde5cb1cce2ca8e8007e41d33833a6400464c | |
| parent | 2cc221861132e0ca54e3f52d506520ded8520e80 (diff) | |
| download | op-kernel-dev-9234f3190bf8b25b11b105191d408ac50a107948.zip op-kernel-dev-9234f3190bf8b25b11b105191d408ac50a107948.tar.gz | |
f2fs: fix possible data corruption in f2fs_write_begin()
f2fs_write_begin() doesn't initialize the 'dn' variable if the inode has
inline data. However it uses its contents to decide whether it should
just zero out the page or load data to it. Thus if we are unlucky we can
zero out page contents instead of loading inline data into a page.
CC: stable@vger.kernel.org
CC: Changman Lee <cm224.lee@samsung.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | fs/f2fs/data.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 973fd77..e3788bd 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -1017,21 +1017,19 @@ inline_data: goto out; } - if (dn.data_blkaddr == NEW_ADDR) { + if (f2fs_has_inline_data(inode)) { + err = f2fs_read_inline_data(inode, page); + if (err) { + page_cache_release(page); + goto fail; + } + } else if (dn.data_blkaddr == NEW_ADDR) { zero_user_segment(page, 0, PAGE_CACHE_SIZE); } else { - if (f2fs_has_inline_data(inode)) { - err = f2fs_read_inline_data(inode, page); - if (err) { - page_cache_release(page); - goto fail; - } - } else { - err = f2fs_submit_page_bio(sbi, page, dn.data_blkaddr, - READ_SYNC); - if (err) - goto fail; - } + err = f2fs_submit_page_bio(sbi, page, dn.data_blkaddr, + READ_SYNC); + if (err) + goto fail; lock_page(page); if (unlikely(!PageUptodate(page))) { |
