From: Darrick J. Wong <djwong@xxxxxxxxxx>
Both file extent size hints are stored as 32-bit quantities, in units of
filesystem blocks. As part of validating the hints, we convert these
quantities to bytes to ensure that the hint is congruent with the file's
allocation size.
The maximum possible hint value is 2097151 (aka XFS_MAX_BMBT_EXTLEN).
If the file allocation unit is larger than 2048, the unit conversion
will exceed 32 bits in size, which overflows the uint32_t used to store
the value used in the comparison. This isn't a problem for files on the
data device since the hint will always be a multiple of the block size.
However, this is a problem for realtime files because the rtextent size
can be any integer number of fs blocks, and truncation of upper bits
changes the outcome of division.
Eliminate the overflow by performing the congruency check in units of
blocks, not bytes. Otherwise, we get errors like this:
$ truncate -s 500T /tmp/a
$ mkfs.xfs -f -N /tmp/a -d extszinherit=2097151,rtinherit=1 -r extsize=28k
illegal extent size hint 2097151, must be less than 2097151 and a multiple of 7.
Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
---
fs/xfs/libxfs/xfs_inode_buf.c | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
index 09dafa8a9ab2..6f2ae73559d1 100644
--- a/fs/xfs/libxfs/xfs_inode_buf.c
+++ b/fs/xfs/libxfs/xfs_inode_buf.c
@@ -740,13 +740,11 @@ xfs_inode_validate_extsize(
bool rt_flag;
bool hint_flag;
bool inherit_flag;
- uint32_t extsize_bytes;
- uint32_t blocksize_bytes;
+ uint32_t alloc_unit = 1;
rt_flag = (flags & XFS_DIFLAG_REALTIME);
hint_flag = (flags & XFS_DIFLAG_EXTSIZE);
inherit_flag = (flags & XFS_DIFLAG_EXTSZINHERIT);
- extsize_bytes = XFS_FSB_TO_B(mp, extsize);
/*
* This comment describes a historic gap in this verifier function.
@@ -775,9 +773,7 @@ xfs_inode_validate_extsize(
*/
if (rt_flag)
- blocksize_bytes = XFS_FSB_TO_B(mp, mp->m_sb.sb_rextsize);
- else
- blocksize_bytes = mp->m_sb.sb_blocksize;
+ alloc_unit = mp->m_sb.sb_rextsize;
if ((hint_flag || inherit_flag) && !(S_ISDIR(mode) || S_ISREG(mode)))
return __this_address;
@@ -795,7 +791,7 @@ xfs_inode_validate_extsize(
if (mode && !(hint_flag || inherit_flag) && extsize != 0)
return __this_address;
- if (extsize_bytes % blocksize_bytes)
+ if (extsize % alloc_unit)
return __this_address;
if (extsize > XFS_MAX_BMBT_EXTLEN)
@@ -830,12 +826,10 @@ xfs_inode_validate_cowextsize(
{
bool rt_flag;
bool hint_flag;
- uint32_t cowextsize_bytes;
- uint32_t blocksize_bytes;
+ uint32_t alloc_unit = 1;
rt_flag = (flags & XFS_DIFLAG_REALTIME);
hint_flag = (flags2 & XFS_DIFLAG2_COWEXTSIZE);
- cowextsize_bytes = XFS_FSB_TO_B(mp, cowextsize);
/*
* Similar to extent size hints, a directory can be configured to
@@ -850,9 +844,7 @@ xfs_inode_validate_cowextsize(
*/
if (rt_flag)
- blocksize_bytes = XFS_FSB_TO_B(mp, mp->m_sb.sb_rextsize);
- else
- blocksize_bytes = mp->m_sb.sb_blocksize;
+ alloc_unit = mp->m_sb.sb_rextsize;
if (hint_flag && !xfs_has_reflink(mp))
return __this_address;
@@ -867,7 +859,7 @@ xfs_inode_validate_cowextsize(
if (mode && !hint_flag && cowextsize != 0)
return __this_address;
- if (cowextsize_bytes % blocksize_bytes)
+ if (cowextsize % alloc_unit)
return __this_address;
if (cowextsize > XFS_MAX_BMBT_EXTLEN)
