fix h_size validation v2
Hi all,
this series fixes the slab out of bounds founds by Sam's fuzzer, and tightens up the h_size validation and log recovery buffer allocation while at it.
Changes since v1:
- fix the commit description and fixes for the first patch
- drop the previously second patch to reduce the scope of the fixup as it needs fixing, refactoring and a good test strategy
PATCH 1/2 xfs: fix log recovery buffer allocation for the legacy h_size fixup
Commit a70f9fe52daa ("xfs: detect and handle invalid iclog size set by mkfs") added a fixup for incorrect h_size values used for the initial umount record in old xfsprogs versions. Later commit 0c771b99d6c9 ("xfs: clean up calculation of LR header blocks") cleaned up the log reover buffer calculation, but stoped using the fixed up h_size value to size the log recovery buffer, which can lead to an out of bounds access when the incorrect h_size does not come from the old mkfs tool, but a fuzzer.
Fix this by open coding xlog_logrec_hblks and taking the fixed h_size into account for this calculation.
--- fs/xfs/xfs_log_recover.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
fs/xfs/xfs_log_recover.c +14 -6
@@ -2999,7 +2999,7 @@ xlog_do_recovery_pass(int error =0 , h_size, h_len;int error2 =0 ;int bblks, split_bblks; -int hblks, split_hblks, wrapped_hblks; +int hblks =1 , split_hblks, wrapped_hblks;int i;struct hlist_head rhash[XLOG_RHASH_SIZE ];LIST_HEAD (buffer_list);
@@ -3055,14 +3055,22 @@ xlog_do_recovery_pass(if (error) goto bread_err1; - hblks =xlog_logrec_hblks (log, rhead); -if (hblks !=1 ) { -kvfree (hbp); - hbp =xlog_alloc_buffer (log, hblks); +/* +* This open codes xlog_logrec_hblks so that we can reuse the +* fixed up h_size value calculated above. Without that we'd +* still allocate the buffer based on the incorrect on-disk +* size. +*/ +if (h_size >XLOG_HEADER_CYCLE_SIZE && + (rhead->h_version &cpu_to_be32 (XLOG_VERSION_2 ))) { + hblks =DIV_ROUND_UP (h_size,XLOG_HEADER_CYCLE_SIZE ); +if (hblks >1 ) { +kvfree (hbp); + hbp =xlog_alloc_buffer (log, hblks); + } } }else {ASSERT (log->l_sectBBsize ==1 ); - hblks =1 ; hbp =xlog_alloc_buffer (log,1 ); h_size =XLOG_BIG_RECORD_BSIZE ; }
Signature · 1 line
2.39.2
PATCH 2/2 xfs: clean up buffer allocation in xlog_do_recovery_pass
In reply to Christoph HellwigMerge the initial xlog_alloc_buffer calls, and pass the variable designating the length that is initialized to 1 above instead of passing the open coded 1 directly.
--- fs/xfs/xfs_log_recover.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
fs/xfs/xfs_log_recover.c +6 -7
@@ -3010,6 +3010,10 @@ xlog_do_recovery_pass(for (i =0 ; i <XLOG_RHASH_SIZE ; i++)INIT_HLIST_HEAD (&rhash[i]); + hbp =xlog_alloc_buffer (log, hblks); +if (!hbp) +return -ENOMEM ; +/* * Read the header of the tail block and get the iclog buffer size from * h_size. Use this to tell how many sectors make up the log header.
@@ -3020,10 +3024,6 @@ xlog_do_recovery_pass(* iclog header and extract the header size from it. Get a * new hbp that is the correct size. */ - hbp =xlog_alloc_buffer (log,1 ); -if (!hbp) -return -ENOMEM ; - error =xlog_bread (log, tail_blk,1 , hbp, &offset);if (error) goto bread_err1;
@@ -3067,16 +3067,15 @@ xlog_do_recovery_pass(if (hblks >1 ) {kvfree (hbp); hbp =xlog_alloc_buffer (log, hblks); +if (!hbp) +return -ENOMEM ; } } }else {ASSERT (log->l_sectBBsize ==1 ); - hbp =xlog_alloc_buffer (log,1 ); h_size =XLOG_BIG_RECORD_BSIZE ; } -if (!hbp) -return -ENOMEM ; dbp =xlog_alloc_buffer (log,BTOBB (h_size));if (!dbp) {kvfree (hbp);
Signature · 1 line
2.39.2