xfs: fix forkoff miscalculation related to XFS_LITINO(mp)
PATCH 1/1 xfs: fix forkoff miscalculation related to XFS_LITINO(mp)
From: Gao Xiang <[email protected]>
commit ada49d64fb3538144192181db05de17e2ffc3551 upstream.
Currently, commit e9e2eae89ddb dropped a (int) decoration from XFS_LITINO(mp), and since sizeof() expression is also involved, the result of XFS_LITINO(mp) is simply as the size_t type (commonly unsigned long).
Considering the expression in xfs_attr_shortform_bytesfit():
offset = (XFS_LITINO(mp) - bytes) >> 3;
let "bytes" be (int)340, and
"XFS_LITINO(mp)" be (unsigned long)336.
on 64-bit platform, the expression is
offset = ((unsigned long)336 - (int)340) >> 3 =
(int)(0xfffffffffffffffcUL >> 3) = -1
but on 32-bit platform, the expression is
offset = ((unsigned long)336 - (int)340) >> 3 =
(int)(0xfffffffcUL >> 3) = 0x1fffffff
instead.
so offset becomes a large positive number on 32-bit platform, and cause xfs_attr_shortform_bytesfit() returns maxforkoff rather than 0.
Therefore, one result is
"ASSERT(new_size <= XFS_IFORK_SIZE(ip, whichfork));"
assertion failure in xfs_idata_realloc(), which was also the root cause of the original bugreport from Dennis, see:
https://bugzilla.redhat.com/show_bug.cgi?id=1894177
And it can also be manually triggered with the following commands:
$ touch a; $ setfattr -n user.0 -v "`seq 0 80`" a; $ setfattr -n user.1 -v "`seq 0 80`" a
on 32-bit platform.
Fix the case in xfs_attr_shortform_bytesfit() by bailing out "XFS_LITINO(mp) < bytes" in advance suggested by Eric and a misleading comment together with this bugfix suggested by Darrick. It seems the other users of XFS_LITINO(mp) are not impacted.
---
Hi Darrick,
I had missed this commit when backporting fixes from 5.11 and 5.12. I have executed 10 iterations of fstests via kdevops and did not notice any new regressions.
Please ack this patch.
fs/xfs/libxfs/xfs_attr_leaf.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
fs/xfs/libxfs/xfs_attr_leaf.c +7 -1
@@ -435,7 +435,7 @@ xfs_attr_copy_value(*========================================================================*/ /* -* Query whether the requested number of additional bytes of extended +* Query whether the total requested number of attr fork bytes of extended * attribute space will be able to fit inline. * * Returns zero if not, else the di_forkoff fork offset to be used in the
@@ -455,6 +455,12 @@ xfs_attr_shortform_bytesfit(int maxforkoff;int offset; +/* +* Check if the new size could fit at all first: +*/ +if (bytes >XFS_LITINO (mp)) +return 0 ; +/* rounded down */ offset = (XFS_LITINO (mp) - bytes) >>3 ;
Signature · 1 line
2.39.1
Quoted 45 lines · Chandan Babu R
From: Gao Xiang <[email protected]>
commit
ada49d64fb3538144192181db05de17e2ffc3551upstream.Currently, commit
e9e2eae89ddbdropped a (int) decoration fromXFS_LITINO(mp), and sincesizeof()expression is also involved, the result ofXFS_LITINO(mp)is simply as thesize_ttype (commonly unsigned long).Considering the expression in
xfs_attr_shortform_bytesfit():
offset = (XFS_LITINO(mp)- bytes) >> 3;
let "bytes" be (int)340, and"XFS_LITINO(mp)" be (unsigned long)336.on 64-bit platform, the expression is
offset = ((unsigned long)336 - (int)340) >> 3 =(int)(0xfffffffffffffffcUL >> 3) = -1but on 32-bit platform, the expression is
offset = ((unsigned long)336 - (int)340) >> 3 =(int)(0xfffffffcUL >> 3) = 0x1fffffffinstead.
so offset becomes a large positive number on 32-bit platform, and cause
xfs_attr_shortform_bytesfit()returns maxforkoff rather than 0.Therefore, one result is
"ASSERT(new_size <= XFS_IFORK_SIZE(ip, whichfork));"assertion failure in
xfs_idata_realloc(), which was also the root cause of the original bugreport from Dennis, see:https://bugzilla.redhat.com/show_bug.cgi?id=1894177And it can also be manually triggered with the following commands:
$ touch a; $ setfattr -n user.0 -v "`seq 0 80`" a; $ setfattr -n user.1 -v "`seq 0 80`" aon 32-bit platform.
Fix the case in
xfs_attr_shortform_bytesfit()by bailing out "XFS_LITINO(mp)< bytes" in advance suggested by Eric and a misleading comment together with this bugfix suggested by Darrick. It seems the other users ofXFS_LITINO(mp)are not impacted.
Quoted 8 lines
Fixes e9e2eae89ddb ("xfs: only check the superblock version for dinode size calculation")Cc <[email protected]> # 5.7+Reported-and-tested-by Dennis Gilmore <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Signed-off-by Gao Xiang <[email protected]>Reviewed-by Darrick J. Wong <[email protected]>Signed-off-by Darrick J. Wong <[email protected]>Signed-off-by Chandan Babu R <[email protected]>
Looks good to me,
--D
Quoted 42 lines
---
Hi Darrick,
I had missed this commit when backporting fixes from 5.11 and 5.12. I have executed 10 iterations of fstests via kdevops and did not notice any new regressions.
Please ack this patch.
fs/xfs/libxfs/xfs_attr_leaf.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)fs/xfs/libxfs/xfs_attr_leaf.c +7
-1@@ -435,7 +435,7 @@ xfs_attr_copy_value(*========================================================================*/ /* -* Query whether the requested number of additional bytes of extended +* Query whether the total requested number of attr fork bytes of extended * attribute space will be able to fit inline. * * Returns zero if not, else the di_forkoff fork offset to be used in the @@ -455,6 +455,12 @@ xfs_attr_shortform_bytesfit(int maxforkoff;int offset; +/* +* Check if the new size could fit at all first: +*/ +if (bytes >XFS_LITINO (mp)) +return 0 ; +/* rounded down */ offset = (XFS_LITINO (mp) - bytes) >>3 ;Signature · 1 line
2.39.1