xfs: add bounds checking to xlog_recover_process_data
PATCH 1/1 xfs: add bounds checking to xlog_recover_process_data
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.
--- fs/xfs/xfs_log_recover.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/xfs/xfs_log_recover.c +4 -1
@@ -2456,7 +2456,10 @@ xlog_recover_process_data( ohead = (struct xlog_op_header *)dp; dp +=sizeof (*ohead); -ASSERT (dp <= end); +if (dp > end) { +xfs_warn (log->l_mp,"%s: op header overrun" , __func__); +return -EFSCORRUPTED ; + }/* errors will abort recovery */ error = xlog_recover_process_ophdr(log, rhash, rhead, ohead,
Signature · 1 line
2.34.1
Quoted 30 lines · lei lu
There is a lack of verification of the space occupied by fixed members of
xlog_op_headerin thexlog_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 thattail_blkandhead_blkare the same, which will result in the inability to enterxlog_recover_process_data
3) Write a tool to parse and modify the copied image in step 2
4) Make the end of thexlog_op_headerentries only 1 byte away fromxlog_rec_header->h_size
5) xlog_rec_header->h_num_logops++
6) Modifyxlog_rec_header->h_crcFix:
Add a check to make sure there is sufficient space to access fixed members ofxlog_op_header.Signed-off-by lei lu <[email protected]>--- fs/xfs/xfs_log_recover.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)fs/xfs/xfs_log_recover.c +0
-0
fs/xfs/xfs_log_recover.c xlog_recover_process_data( · line 2462
Quoted 8 lines
fs/xfs/xfs_log_recover.c +4
-1@@ -2456,7 +2456,10 @@ xlog_recover_process_data( ohead = (struct xlog_op_header *)dp; dp +=sizeof (*ohead); -ASSERT (dp <= end); +if (dp > end) { +xfs_warn (log->l_mp,"%s: op header overrun" , __func__); +return -EFSCORRUPTED ; + }
looks fine.
Signature · 2 lines
Dave Chinner [email protected]
Quoted 16 lines · lei lu
There is a lack of verification of the space occupied by fixed members of
xlog_op_headerin thexlog_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 thattail_blkandhead_blkare the same, which will result in the inability to enterxlog_recover_process_data
3) Write a tool to parse and modify the copied image in step 2
4) Make the end of thexlog_op_headerentries only 1 byte away fromxlog_rec_header->h_size
5) xlog_rec_header->h_num_logops++
6) Modifyxlog_rec_header->h_crc
Quoted 5 lines
Fix:
Add a check to make sure there is sufficient space to access fixed members ofxlog_op_header.Signed-off-by lei lu <[email protected]>
Looks good to me,
--D
Quoted 24 lines
--- fs/xfs/xfs_log_recover.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)fs/xfs/xfs_log_recover.c +4
-1@@ -2456,7 +2456,10 @@ xlog_recover_process_data( ohead = (struct xlog_op_header *)dp; dp +=sizeof (*ohead); -ASSERT (dp <= end); +if (dp > end) { +xfs_warn (log->l_mp,"%s: op header overrun" , __func__); +return -EFSCORRUPTED ; + }/* errors will abort recovery */ error = xlog_recover_process_ophdr(log, rhash, rhead, ohead,Signature · 1 line
2.34.1