Skip to content

Commit d4edd79

Browse files
committed
xfs: add bounds checking to xlog_recover_process_data
jira LE-3201 cve CVE-2024-41014 Rebuild_History Non-Buildable kernel-rt-4.18.0-553.22.1.rt7.363.el8_10 commit-author lei lu <[email protected]> commit fb63435 There is a lack of verification of the space occupied by fixed members of xlog_op_header in the xlog_recover_process_data. We can create a crafted image to trigger an out of bounds read by following these steps: 1) Mount an image of xfs, and do some file operations to leave records 2) Before umounting, copy the image for subsequent steps to simulate abnormal exit. Because umount will ensure that tail_blk and head_blk are the same, which will result in the inability to enter xlog_recover_process_data 3) Write a tool to parse and modify the copied image in step 2 4) Make the end of the xlog_op_header entries only 1 byte away from xlog_rec_header->h_size 5) xlog_rec_header->h_num_logops++ 6) Modify xlog_rec_header->h_crc Fix: Add a check to make sure there is sufficient space to access fixed members of xlog_op_header. Signed-off-by: lei lu <[email protected]> Reviewed-by: Dave Chinner <[email protected]> Reviewed-by: Darrick J. Wong <[email protected]> Signed-off-by: Chandan Babu R <[email protected]> (cherry picked from commit fb63435) Signed-off-by: Jonathan Maple <[email protected]>
1 parent 1260bb5 commit d4edd79

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

fs/xfs/xfs_log_recover.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2419,7 +2419,10 @@ xlog_recover_process_data(
24192419

24202420
ohead = (struct xlog_op_header *)dp;
24212421
dp += sizeof(*ohead);
2422-
ASSERT(dp <= end);
2422+
if (dp > end) {
2423+
xfs_warn(log->l_mp, "%s: op header overrun", __func__);
2424+
return -EFSCORRUPTED;
2425+
}
24232426

24242427
/* errors will abort recovery */
24252428
error = xlog_recover_process_ophdr(log, rhash, rhead, ohead,

0 commit comments

Comments
 (0)