Skip to content

Commit dda9f4b

Browse files
chaseyuJaegeuk Kim
authored and
Jaegeuk Kim
committed
f2fs: fix to skip verifying block address for non-regular inode
generic/184 1s ... [failed, exit status 1]- output mismatch --- tests/generic/184.out 2015-01-11 16:52:27.643681072 +0800 QA output created by 184 - silence is golden +rm: cannot remove '/mnt/f2fs/null': Bad address +mknod: '/mnt/f2fs/null': Bad address +chmod: cannot access '/mnt/f2fs/null': Bad address +./tests/generic/184: line 36: /mnt/f2fs/null: Bad address ... F2FS-fs (zram0): access invalid blkaddr:259 EIP: f2fs_is_valid_blkaddr+0x14b/0x1b0 [f2fs] f2fs_iget+0x927/0x1010 [f2fs] f2fs_lookup+0x26e/0x630 [f2fs] __lookup_slow+0xb3/0x140 lookup_slow+0x31/0x50 walk_component+0x185/0x1f0 path_lookupat+0x51/0x190 filename_lookup+0x7f/0x140 user_path_at_empty+0x36/0x40 vfs_statx+0x61/0xc0 __do_sys_stat64+0x29/0x40 sys_stat64+0x13/0x20 do_fast_syscall_32+0xaa/0x22c entry_SYSENTER_32+0x53/0x86 In f2fs_iget(), we will check inode's first block address, if it is valid, we will set FI_FIRST_BLOCK_WRITTEN flag in inode. But we should only do this for regular inode, otherwise, like special inode, i_addr[0] is used for storing device info instead of block address, it will fail checking flow obviously. So for non-regular inode, let's skip verifying address and setting flag. Signed-off-by: Chao Yu <[email protected]> Signed-off-by: Jaegeuk Kim <[email protected]>
1 parent 7fa750a commit dda9f4b

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

fs/f2fs/inode.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -371,13 +371,15 @@ static int do_read_inode(struct inode *inode)
371371
/* get rdev by using inline_info */
372372
__get_inode_rdev(inode, ri);
373373

374-
err = __written_first_block(sbi, ri);
375-
if (err < 0) {
376-
f2fs_put_page(node_page, 1);
377-
return err;
374+
if (S_ISREG(inode->i_mode)) {
375+
err = __written_first_block(sbi, ri);
376+
if (err < 0) {
377+
f2fs_put_page(node_page, 1);
378+
return err;
379+
}
380+
if (!err)
381+
set_inode_flag(inode, FI_FIRST_BLOCK_WRITTEN);
378382
}
379-
if (!err)
380-
set_inode_flag(inode, FI_FIRST_BLOCK_WRITTEN);
381383

382384
if (!f2fs_need_inode_block_update(sbi, inode->i_ino))
383385
fi->last_disk_size = inode->i_size;

0 commit comments

Comments
 (0)