Skip to content

Commit 73687c5

Browse files
chaseyugregkh
authored andcommitted
f2fs: fix to do sanity check on summary info
commit c6ad7fd upstream. As Wenqing Liu reported in bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=216456 BUG: KASAN: use-after-free in recover_data+0x63ae/0x6ae0 [f2fs] Read of size 4 at addr ffff8881464dcd80 by task mount/1013 CPU: 3 PID: 1013 Comm: mount Tainted: G W 6.0.0-rc4 #1 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.15.0-1 04/01/2014 Call Trace: dump_stack_lvl+0x45/0x5e print_report.cold+0xf3/0x68d kasan_report+0xa8/0x130 recover_data+0x63ae/0x6ae0 [f2fs] f2fs_recover_fsync_data+0x120d/0x1fc0 [f2fs] f2fs_fill_super+0x4665/0x61e0 [f2fs] mount_bdev+0x2cf/0x3b0 legacy_get_tree+0xed/0x1d0 vfs_get_tree+0x81/0x2b0 path_mount+0x47e/0x19d0 do_mount+0xce/0xf0 __x64_sys_mount+0x12c/0x1a0 do_syscall_64+0x38/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd The root cause is: in fuzzed image, SSA table is corrupted: ofs_in_node is larger than ADDRS_PER_PAGE(), result in out-of-range access on 4k-size page. - recover_data - do_recover_data - check_index_in_prev_nodes - f2fs_data_blkaddr This patch adds sanity check on summary info in recovery and GC flow in where the flows rely on them. After patch: [ 29.310883] F2FS-fs (loop0): Inconsistent ofs_in_node:65286 in summary, ino:0, nid:6, max:1018 Cc: [email protected] Reported-by: Wenqing Liu <[email protected]> Signed-off-by: Chao Yu <[email protected]> Signed-off-by: Jaegeuk Kim <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent ed854f1 commit 73687c5

File tree

2 files changed

+21
-4
lines changed

2 files changed

+21
-4
lines changed

fs/f2fs/gc.c

+9-1
Original file line numberDiff line numberDiff line change
@@ -1002,7 +1002,7 @@ static bool is_alive(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,
10021002
{
10031003
struct page *node_page;
10041004
nid_t nid;
1005-
unsigned int ofs_in_node;
1005+
unsigned int ofs_in_node, max_addrs;
10061006
block_t source_blkaddr;
10071007

10081008
nid = le32_to_cpu(sum->nid);
@@ -1028,6 +1028,14 @@ static bool is_alive(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,
10281028
return false;
10291029
}
10301030

1031+
max_addrs = IS_INODE(node_page) ? DEF_ADDRS_PER_INODE :
1032+
DEF_ADDRS_PER_BLOCK;
1033+
if (ofs_in_node >= max_addrs) {
1034+
f2fs_err(sbi, "Inconsistent ofs_in_node:%u in summary, ino:%u, nid:%u, max:%u",
1035+
ofs_in_node, dni->ino, dni->nid, max_addrs);
1036+
return false;
1037+
}
1038+
10311039
*nofs = ofs_of_node(node_page);
10321040
source_blkaddr = data_blkaddr(NULL, node_page, ofs_in_node);
10331041
f2fs_put_page(node_page, 1);

fs/f2fs/recovery.c

+12-3
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ static int check_index_in_prev_nodes(struct f2fs_sb_info *sbi,
452452
struct dnode_of_data tdn = *dn;
453453
nid_t ino, nid;
454454
struct inode *inode;
455-
unsigned int offset;
455+
unsigned int offset, ofs_in_node, max_addrs;
456456
block_t bidx;
457457
int i;
458458

@@ -479,15 +479,24 @@ static int check_index_in_prev_nodes(struct f2fs_sb_info *sbi,
479479
got_it:
480480
/* Use the locked dnode page and inode */
481481
nid = le32_to_cpu(sum.nid);
482+
ofs_in_node = le16_to_cpu(sum.ofs_in_node);
483+
484+
max_addrs = ADDRS_PER_PAGE(dn->node_page, dn->inode);
485+
if (ofs_in_node >= max_addrs) {
486+
f2fs_err(sbi, "Inconsistent ofs_in_node:%u in summary, ino:%lu, nid:%u, max:%u",
487+
ofs_in_node, dn->inode->i_ino, nid, max_addrs);
488+
return -EFSCORRUPTED;
489+
}
490+
482491
if (dn->inode->i_ino == nid) {
483492
tdn.nid = nid;
484493
if (!dn->inode_page_locked)
485494
lock_page(dn->inode_page);
486495
tdn.node_page = dn->inode_page;
487-
tdn.ofs_in_node = le16_to_cpu(sum.ofs_in_node);
496+
tdn.ofs_in_node = ofs_in_node;
488497
goto truncate_out;
489498
} else if (dn->nid == nid) {
490-
tdn.ofs_in_node = le16_to_cpu(sum.ofs_in_node);
499+
tdn.ofs_in_node = ofs_in_node;
491500
goto truncate_out;
492501
}
493502

0 commit comments

Comments
 (0)