aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChao Yu2020-11-02 03:36:58 -0600
committerJaegeuk Kim2020-12-21 15:33:10 -0600
commitcb94abe12ad29c0296855b665fa46ce3d042646c (patch)
treeb3e1786fe92335bdba3f9e64df2a6f110cb1b4ee
parent2838d734a81bbedac02d63e6d541dfd988120e68 (diff)
downloadkernel-cb94abe12ad29c0296855b665fa46ce3d042646c.tar.gz
kernel-cb94abe12ad29c0296855b665fa46ce3d042646c.tar.xz
kernel-cb94abe12ad29c0296855b665fa46ce3d042646c.zip
f2fs: fix to seek incorrect data offset in inline data file
As kitestramuort reported: F2FS-fs (nvme0n1p4): access invalid blkaddr:1598541474 [ 25.725898] ------------[ cut here ]------------ [ 25.725903] WARNING: CPU: 6 PID: 2018 at f2fs_is_valid_blkaddr+0x23a/0x250 [ 25.725923] Call Trace: [ 25.725927] ? f2fs_llseek+0x204/0x620 [ 25.725929] ? ovl_copy_up_data+0x14f/0x200 [ 25.725931] ? ovl_copy_up_inode+0x174/0x1e0 [ 25.725933] ? ovl_copy_up_one+0xa22/0xdf0 [ 25.725936] ? ovl_copy_up_flags+0xa6/0xf0 [ 25.725938] ? ovl_aio_cleanup_handler+0xd0/0xd0 [ 25.725939] ? ovl_maybe_copy_up+0x86/0xa0 [ 25.725941] ? ovl_open+0x22/0x80 [ 25.725943] ? do_dentry_open+0x136/0x350 [ 25.725945] ? path_openat+0xb7e/0xf40 [ 25.725947] ? __check_sticky+0x40/0x40 [ 25.725948] ? do_filp_open+0x70/0x100 [ 25.725950] ? __check_sticky+0x40/0x40 [ 25.725951] ? __check_sticky+0x40/0x40 [ 25.725953] ? __x64_sys_openat+0x1db/0x2c0 [ 25.725955] ? do_syscall_64+0x2d/0x40 [ 25.725957] ? entry_SYSCALL_64_after_hwframe+0x44/0xa9 llseek() reports invalid block address access, the root cause is if file has inline data, f2fs_seek_block() will access inline data regard as block address index in inode block, which should be wrong, fix it. Reported-by: kitestramuort <kitestramuort@autistici.org> Signed-off-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-rw-r--r--fs/f2fs/file.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index ee861c6d9ff0..fe39e591e5b4 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -412,9 +412,14 @@ static loff_t f2fs_seek_block(struct file *file, loff_t offset, int whence)
412 goto fail; 412 goto fail;
413 413
414 /* handle inline data case */ 414 /* handle inline data case */
415 if (f2fs_has_inline_data(inode) && whence == SEEK_HOLE) { 415 if (f2fs_has_inline_data(inode)) {
416 data_ofs = isize; 416 if (whence == SEEK_HOLE) {
417 goto found; 417 data_ofs = isize;
418 goto found;
419 } else if (whence == SEEK_DATA) {
420 data_ofs = offset;
421 goto found;
422 }
418 } 423 }
419 424
420 pgofs = (pgoff_t)(offset >> PAGE_SHIFT); 425 pgofs = (pgoff_t)(offset >> PAGE_SHIFT);