Skip to content

Commit

Permalink
xfs: fix 32-bit truncation in xfs_compute_rextslog
Browse files Browse the repository at this point in the history
It's quite reasonable that some customer somewhere will want to
configure a realtime volume with more than 2^32 extents.  If they try to
do this, the highbit32() call will truncate the upper bits of the
xfs_rtbxlen_t and produce the wrong value for rextslog.  This in turn
causes the rsumlevels to be wrong, which results in a realtime summary
file that is the wrong length.  Fix that.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
  • Loading branch information
Darrick J. Wong committed Dec 7, 2023
1 parent a6a38f3 commit cf8f0e6
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions fs/xfs/libxfs/xfs_rtbitmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -1132,14 +1132,16 @@ xfs_rtbitmap_blockcount(

/*
* Compute the maximum level number of the realtime summary file, as defined by
* mkfs. The use of highbit32 on a 64-bit quantity is a historic artifact that
* prohibits correct use of rt volumes with more than 2^32 extents.
* mkfs. The historic use of highbit32 on a 64-bit quantity prohibited correct
* use of rt volumes with more than 2^32 extents.
*/
uint8_t
xfs_compute_rextslog(
xfs_rtbxlen_t rtextents)
{
return rtextents ? xfs_highbit32(rtextents) : 0;
if (!rtextents)
return 0;
return xfs_highbit64(rtextents);
}

/*
Expand Down

0 comments on commit cf8f0e6

Please sign in to comment.