xfs: AGF length has never been bounds checked
PATCH 1/1 xfs: AGF length has never been bounds checked
From: Dave Chinner <[email protected]>
The AGF verifier does not check that the AGF length field is within known good bounds. This has never been checked by runtime kernel code (i.e. the lack of verification goes back to 1993) yet we assume in many places that it is correct and verify other metdata against it.
Add length verification to the AGF verifier. The length of the AGF must be equal to the size of the AG specified in the superblock, unless it is the last AG in the filesystem. In that case, it must be less than or equal to sb->sb_agblocks and greater than XFS_MIN_AG_BLOCKS, which is the smallest AG a growfs operation will allow to exist.
This requires a bit of rework of the verifier function. We want to verify metadata before we use it to verify other metadata. Hence we need to verify the AGF sequence numbers before using them to verify the length of the AGF. Then we can verify the AGF length before we verify AGFL fields. Then we can verifier other fields that are bounds limited by the AGF length.
And, finally, by calculating agf_length only once into a local variable, we can collapse repeated "if (xfs_has_foo() &&" conditionaly checks into single checks. This makes the code much easier to follow as all the checks for a given feature are obviously in the same place.
--- fs/xfs/libxfs/xfs_alloc.c | 81 ++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 35 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +46 -35
@@ -2970,6 +2970,7 @@ xfs_agf_verify( {struct xfs_mount *mp = bp->b_mount;struct xfs_agf *agf = bp->b_addr; +uint32_t agf_length =be32_to_cpu (agf->agf_length);if (xfs_has_crc (mp)) {if (!uuid_equal (&agf->agf_uuid, &mp->m_sb.sb_meta_uuid))
@@ -2981,18 +2982,38 @@ xfs_agf_verify(if (!xfs_verify_magic (bp, agf->agf_magicnum))return __this_address; -if (!(XFS_AGF_GOOD_VERSION (be32_to_cpu (agf->agf_versionnum)) && -be32_to_cpu (agf->agf_freeblks) <=be32_to_cpu (agf->agf_length) && -be32_to_cpu (agf->agf_flfirst) <xfs_agfl_size (mp) && -be32_to_cpu (agf->agf_fllast) <xfs_agfl_size (mp) && -be32_to_cpu (agf->agf_flcount) <=xfs_agfl_size (mp))) +if (!(XFS_AGF_GOOD_VERSION (be32_to_cpu (agf->agf_versionnum))))return __this_address; -if (be32_to_cpu (agf->agf_length) > mp->m_sb.sb_dblocks) +/* +* during growfs operations, the perag is not fully initialised, +* so we can't use it for any useful checking. growfs ensures we can't +* use it by using uncached buffers that don't have the perag attached +* so we can detect and avoid this problem. +*/ +if (bp->b_pag &&be32_to_cpu (agf->agf_seqno) != bp->b_pag->pag_agno) +return __this_address; + +/* +* Only the last AGF in the filesytsem is allowed to be shorter +* than the AG size recorded in the superblock. +*/ +if (agf_length != mp->m_sb.sb_agblocks) { +if (be32_to_cpu (agf->agf_seqno) != mp->m_sb.sb_agcount -1 ) +return __this_address; +if (agf_length <XFS_MIN_AG_BLOCKS ) +return __this_address; +if (agf_length > mp->m_sb.sb_agblocks) +return __this_address; + } + +if (be32_to_cpu (agf->agf_flfirst) >=xfs_agfl_size (mp) || +be32_to_cpu (agf->agf_fllast) >=xfs_agfl_size (mp) || +be32_to_cpu (agf->agf_flcount) >xfs_agfl_size (mp))return __this_address;if (be32_to_cpu (agf->agf_freeblks) <be32_to_cpu (agf->agf_longest) || -be32_to_cpu (agf->agf_freeblks) >be32_to_cpu (agf->agf_length)) +be32_to_cpu (agf->agf_freeblks) > agf_length)return __this_address; if (be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]) < 1 ||
@@ -3003,38 +3024,28 @@ xfs_agf_verify( mp->m_alloc_maxlevels)return __this_address; -if (xfs_has_rmapbt (mp) && - (be32_to_cpu (agf->agf_levels[XFS_BTNUM_RMAP ]) <1 || -be32_to_cpu (agf->agf_levels[XFS_BTNUM_RMAP ]) > - mp->m_rmap_maxlevels)) -return __this_address; - -if (xfs_has_rmapbt (mp) && -be32_to_cpu (agf->agf_rmap_blocks) >be32_to_cpu (agf->agf_length)) -return __this_address; - -/* -* during growfs operations, the perag is not fully initialised, -* so we can't use it for any useful checking. growfs ensures we can't -* use it by using uncached buffers that don't have the perag attached -* so we can detect and avoid this problem. -*/ -if (bp->b_pag &&be32_to_cpu (agf->agf_seqno) != bp->b_pag->pag_agno) -return __this_address; -if (xfs_has_lazysbcount (mp) && -be32_to_cpu (agf->agf_btreeblks) >be32_to_cpu (agf->agf_length)) +be32_to_cpu (agf->agf_btreeblks) > agf_length)return __this_address; -if (xfs_has_reflink (mp) && -be32_to_cpu (agf->agf_refcount_blocks) > -be32_to_cpu (agf->agf_length)) -return __this_address; +if (xfs_has_rmapbt (mp)) { +if (be32_to_cpu (agf->agf_rmap_blocks) > agf_length) +return __this_address; -if (xfs_has_reflink (mp) && - (be32_to_cpu (agf->agf_refcount_level) <1 || -be32_to_cpu (agf->agf_refcount_level) > mp->m_refc_maxlevels)) -return __this_address; +if (be32_to_cpu (agf->agf_levels[XFS_BTNUM_RMAP ]) <1 || +be32_to_cpu (agf->agf_levels[XFS_BTNUM_RMAP ]) > + mp->m_rmap_maxlevels) +return __this_address; + } + +if (xfs_has_reflink (mp)) { +if (be32_to_cpu (agf->agf_refcount_blocks) > agf_length) +return __this_address; + +if (be32_to_cpu (agf->agf_refcount_level) <1 || +be32_to_cpu (agf->agf_refcount_level) > mp->m_refc_maxlevels) +return __this_address; + }return NULL ; }
Signature · 1 line
2.40.1
Quoted 5 lines · Dave Chinner
From: Dave Chinner <[email protected]>
The AGF verifier does not check that the AGF length field is within known good bounds. This has never been checked by runtime kernel code (i.e. the lack of verification goes back to 1993) yet we assume
Woo hoo!
Quoted 48 lines
in many places that it is correct and verify other metdata against it.
Add length verification to the AGF verifier. The length of the AGF must be equal to the size of the AG specified in the superblock, unless it is the last AG in the filesystem. In that case, it must be less than or equal to
sb->sb_agblocksand greater thanXFS_MIN_AG_BLOCKS, which is the smallest AG a growfs operation will allow to exist.This requires a bit of rework of the verifier function. We want to verify metadata before we use it to verify other metadata. Hence we need to verify the AGF sequence numbers before using them to verify the length of the AGF. Then we can verify the AGF length before we verify AGFL fields. Then we can verifier other fields that are bounds limited by the AGF length.
And, finally, by calculating
agf_lengthonly once into a local variable, we can collapse repeated "if (xfs_has_foo()&&" conditionaly checks into single checks. This makes the code much easier to follow as all the checks for a given feature are obviously in the same place.Signed-off-by Dave Chinner <[email protected]>--- fs/xfs/libxfs/xfs_alloc.c | 81 ++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 35 deletions(-)fs/xfs/libxfs/xfs_alloc.c +1
-4@@ -2970,6 +2970,7 @@ xfs_agf_verify( {struct xfs_mount *mp = bp->b_mount;struct xfs_agf *agf = bp->b_addr; +uint32_t agf_length =be32_to_cpu (agf->agf_length);if (xfs_has_crc (mp)) {if (!uuid_equal (&agf->agf_uuid, &mp->m_sb.sb_meta_uuid))@@ -2981,18 +2982,38 @@ xfs_agf_verify(if (!xfs_verify_magic (bp, agf->agf_magicnum))return __this_address; - if (!(XFS_AGF_GOOD_VERSION(be32_to_cpu(agf->agf_versionnum)) && - be32_to_cpu(agf->agf_freeblks) <= be32_to_cpu(agf->agf_length) && - be32_to_cpu(agf->agf_flfirst) < xfs_agfl_size(mp) && - be32_to_cpu(agf->agf_fllast) < xfs_agfl_size(mp) &&
fs/xfs/libxfs/xfs_alloc.c xfs_agf_verify( · line 2992
Quoted 10 lines
fs/xfs/libxfs/xfs_alloc.c +6
-2- be32_to_cpu(agf->agf_flcount) <= xfs_agfl_size(mp))) +if (!(XFS_AGF_GOOD_VERSION (be32_to_cpu (agf->agf_versionnum))))return __this_address; -if (be32_to_cpu (agf->agf_length) > mp->m_sb.sb_dblocks) +/* +* during growfs operations, the perag is not fully initialised, +* so we can't use it for any useful checking. growfs ensures we can't +* use it by using uncached buffers that don't have the perag attached +* so we can detect and avoid this problem.
Would you mind adding an extra sentence here:
"Both agf_seqno and agf_length need to be validated before anything else fsblock related in the AGF."
fs/xfs/libxfs/xfs_alloc.c xfs_agf_verify( · line 3004
Quoted 12 lines
fs/xfs/libxfs/xfs_alloc.c +12
-0+*/ +if (bp->b_pag &&be32_to_cpu (agf->agf_seqno) != bp->b_pag->pag_agno) +return __this_address; + +/* +* Only the last AGF in the filesytsem is allowed to be shorter +* than the AG size recorded in the superblock. +*/ +if (agf_length != mp->m_sb.sb_agblocks) { +if (be32_to_cpu (agf->agf_seqno) != mp->m_sb.sb_agcount -1 ) +return __this_address; +if (agf_length <XFS_MIN_AG_BLOCKS )
The superblock verifier checks that sb_agblocks >= XFS_MIN_AG_BYTES, which means that it can't be less than 16MB. That's the lower bound on the general AG size, not the lower bound of a runt AG at the end of the fs.
OTOH, the lower bound of a runt AG is XFS_MIN_AG_BLOCKS, or 64FSB. I would sorta like this to be outside this sub-block since that's independent of whatever sb_agblocks is.
That said, there is no filesystem where setting sb_agblocks to 16MB would result in an sb_agblocks with a value less than 256, so I suppose this is a moot worry of mine.
Does that make sense?
fs/xfs/libxfs/xfs_alloc.c xfs_agf_verify( · line 3013
Quoted 9 lines
fs/xfs/libxfs/xfs_alloc.c +8
-0+return __this_address; +if (agf_length > mp->m_sb.sb_agblocks) +return __this_address; + } + +if (be32_to_cpu (agf->agf_flfirst) >=xfs_agfl_size (mp) || +be32_to_cpu (agf->agf_fllast) >=xfs_agfl_size (mp) || +be32_to_cpu (agf->agf_flcount) >xfs_agfl_size (mp))return __this_address;
I wish each check would get its own return __this_address. Today I was debugging some dumb bug but addr2line dropped me off in the middle of this mound of code. :(
Oh well, not required to land /this/ patch. Everything else in this patch looks good.
--D
Quoted 67 lines
fs/xfs/libxfs/xfs_alloc.c +19
-29if (be32_to_cpu (agf->agf_freeblks) <be32_to_cpu (agf->agf_longest) || -be32_to_cpu (agf->agf_freeblks) >be32_to_cpu (agf->agf_length)) +be32_to_cpu (agf->agf_freeblks) > agf_length)return __this_address; if (be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]) < 1 ||@@ -3003,38 +3024,28 @@ xfs_agf_verify( mp->m_alloc_maxlevels)return __this_address; -if (xfs_has_rmapbt (mp) && - (be32_to_cpu (agf->agf_levels[XFS_BTNUM_RMAP ]) <1 || -be32_to_cpu (agf->agf_levels[XFS_BTNUM_RMAP ]) > - mp->m_rmap_maxlevels)) -return __this_address; - -if (xfs_has_rmapbt (mp) && -be32_to_cpu (agf->agf_rmap_blocks) >be32_to_cpu (agf->agf_length)) -return __this_address; - -/* -* during growfs operations, the perag is not fully initialised, -* so we can't use it for any useful checking. growfs ensures we can't -* use it by using uncached buffers that don't have the perag attached -* so we can detect and avoid this problem. -*/ -if (bp->b_pag &&be32_to_cpu (agf->agf_seqno) != bp->b_pag->pag_agno) -return __this_address; -if (xfs_has_lazysbcount (mp) && -be32_to_cpu (agf->agf_btreeblks) >be32_to_cpu (agf->agf_length)) +be32_to_cpu (agf->agf_btreeblks) > agf_length)return __this_address; -if (xfs_has_reflink (mp) && -be32_to_cpu (agf->agf_refcount_blocks) > -be32_to_cpu (agf->agf_length)) -return __this_address; +if (xfs_has_rmapbt (mp)) { +if (be32_to_cpu (agf->agf_rmap_blocks) > agf_length) +return __this_address; -if (xfs_has_reflink (mp) && - (be32_to_cpu (agf->agf_refcount_level) <1 || -be32_to_cpu (agf->agf_refcount_level) > mp->m_refc_maxlevels)) -return __this_address; +if (be32_to_cpu (agf->agf_levels[XFS_BTNUM_RMAP ]) <1 || +be32_to_cpu (agf->agf_levels[XFS_BTNUM_RMAP ]) > + mp->m_rmap_maxlevels) +return __this_address; + } + +if (xfs_has_reflink (mp)) { +if (be32_to_cpu (agf->agf_refcount_blocks) > agf_length) +return __this_address; + +if (be32_to_cpu (agf->agf_refcount_level) <1 || +be32_to_cpu (agf->agf_refcount_level) > mp->m_refc_maxlevels) +return __this_address; + }return NULL ; }Signature · 1 line
2.40.1
Quoted 70 lines · Darrick J. Wong
Quoted 5 lines · Dave Chinner
From: Dave Chinner <[email protected]>
The AGF verifier does not check that the AGF length field is within known good bounds. This has never been checked by runtime kernel code (i.e. the lack of verification goes back to 1993) yet we assume
Woo hoo!
Quoted 48 lines
in many places that it is correct and verify other metdata against it.
Add length verification to the AGF verifier. The length of the AGF must be equal to the size of the AG specified in the superblock, unless it is the last AG in the filesystem. In that case, it must be less than or equal to
sb->sb_agblocksand greater thanXFS_MIN_AG_BLOCKS, which is the smallest AG a growfs operation will allow to exist.This requires a bit of rework of the verifier function. We want to verify metadata before we use it to verify other metadata. Hence we need to verify the AGF sequence numbers before using them to verify the length of the AGF. Then we can verify the AGF length before we verify AGFL fields. Then we can verifier other fields that are bounds limited by the AGF length.
And, finally, by calculating
agf_lengthonly once into a local variable, we can collapse repeated "if (xfs_has_foo()&&" conditionaly checks into single checks. This makes the code much easier to follow as all the checks for a given feature are obviously in the same place.Signed-off-by Dave Chinner <[email protected]>--- fs/xfs/libxfs/xfs_alloc.c | 81 ++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 35 deletions(-)fs/xfs/libxfs/xfs_alloc.c +1
-4@@ -2970,6 +2970,7 @@ xfs_agf_verify( {struct xfs_mount *mp = bp->b_mount;struct xfs_agf *agf = bp->b_addr; +uint32_t agf_length =be32_to_cpu (agf->agf_length);if (xfs_has_crc (mp)) {if (!uuid_equal (&agf->agf_uuid, &mp->m_sb.sb_meta_uuid))@@ -2981,18 +2982,38 @@ xfs_agf_verify(if (!xfs_verify_magic (bp, agf->agf_magicnum))return __this_address; - if (!(XFS_AGF_GOOD_VERSION(be32_to_cpu(agf->agf_versionnum)) && - be32_to_cpu(agf->agf_freeblks) <= be32_to_cpu(agf->agf_length) && - be32_to_cpu(agf->agf_flfirst) < xfs_agfl_size(mp) && - be32_to_cpu(agf->agf_fllast) < xfs_agfl_size(mp) &&fs/xfs/libxfs/xfs_alloc.c xfs_agf_verify( · line 2992
Quoted 10 lines
fs/xfs/libxfs/xfs_alloc.c +6
-2- be32_to_cpu(agf->agf_flcount) <= xfs_agfl_size(mp))) +if (!(XFS_AGF_GOOD_VERSION (be32_to_cpu (agf->agf_versionnum))))return __this_address; -if (be32_to_cpu (agf->agf_length) > mp->m_sb.sb_dblocks) +/* +* during growfs operations, the perag is not fully initialised, +* so we can't use it for any useful checking. growfs ensures we can't +* use it by using uncached buffers that don't have the perag attached +* so we can detect and avoid this problem. Would you mind adding an extra sentence here:
Quoted 2 lines
"Both
agf_seqnoandagf_lengthneed to be validated before anything else fsblock related in the AGF."
Yup.
Quoted 9 lines
Quoted 9 lines
fs/xfs/libxfs/xfs_alloc.c +9
-0+*/ +if (bp->b_pag &&be32_to_cpu (agf->agf_seqno) != bp->b_pag->pag_agno) +return __this_address; + +/* +* Only the last AGF in the filesytsem is allowed to be shorter +* than the AG size recorded in the superblock. +*/ +if (agf_length != mp->m_sb.sb_agblocks) {
Quoted 8 lines
fs/xfs/libxfs/xfs_alloc.c xfs_agf_verify( · line 3004
Quoted 3 lines
fs/xfs/libxfs/xfs_alloc.c +3
-0+if (be32_to_cpu (agf->agf_seqno) != mp->m_sb.sb_agcount -1 ) +return __this_address; +if (agf_length <XFS_MIN_AG_BLOCKS )The superblock verifier checks that
sb_agblocks>=XFS_MIN_AG_BYTES, which means that it can't be less than 16MB. That's the lower bound on the general AG size, not the lower bound of a runt AG at the end of the fs.
*nod*
Quoted 9 lines
OTOH, the lower bound of a runt AG is
XFS_MIN_AG_BLOCKS, or 64FSB. I would sorta like this to be outside this sub-block since that's independent of whateversb_agblocksis.That said, there is no filesystem where setting
sb_agblocksto 16MB would result in ansb_agblockswith a value less than 256, so I suppose this is a moot worry of mine.Does that make sense?
*nod*.
The sb verifier is checking valid sb_agblocks bounds, and this is just checking the invariant that all AGs must be the same size as sb_agblocks, except for the runt AG. The runt AG has bounds of XFS_MIN_AG_BLOCKS <= agf_length <= sb_agblocks, so we check those here...
Quoted 5 lines
Quoted 5 lines
fs/xfs/libxfs/xfs_alloc.c +5
-0+return __this_address; +if (agf_length > mp->m_sb.sb_agblocks) +return __this_address; + } +
Quoted 8 lines
fs/xfs/libxfs/xfs_alloc.c xfs_agf_verify( · line 3013
Quoted 4 lines
fs/xfs/libxfs/xfs_alloc.c +3
-0+if (be32_to_cpu (agf->agf_flfirst) >=xfs_agfl_size (mp) || +be32_to_cpu (agf->agf_fllast) >=xfs_agfl_size (mp) || +be32_to_cpu (agf->agf_flcount) >xfs_agfl_size (mp))return __this_address;I wish each check would get its own return
__this_address. Today I was debugging some dumb bug but addr2line dropped me off in the middle of this mound of code. :(
I've got to revise it for the comment above, so I can do that easily enough here too.
Cheers,
Dave.
Signature · 2 lines
Dave Chinner [email protected]
fs/xfs/libxfs/xfs_alloc.c xfs_agf_verify( · line 2985
Quoted 1 line · Dave Chinner
fs/xfs/libxfs/xfs_alloc.c +1
-0+if (!(XFS_AGF_GOOD_VERSION (be32_to_cpu (agf->agf_versionnum))))
This has a superflous set of braces that can be dropped.
fs/xfs/libxfs/xfs_alloc.c xfs_agf_verify( · line 2989
Quoted 2 lines
fs/xfs/libxfs/xfs_alloc.c +2
-0+/* +* during growfs operations, the perag is not fully initialised,
Missing captialization for the first word. (And yes I noticed this just moved, but we might as well fix it up while at it).
Otherwise this looks good: