Skip to content

Commit 017265f

Browse files
Eric Sandeengregkh
Eric Sandeen
authored andcommitted
xfs: fix boundary test in xfs_attr_shortform_verify
[ Upstream commit f402043 ] The boundary test for the fixed-offset parts of xfs_attr_sf_entry in xfs_attr_shortform_verify is off by one, because the variable array at the end is defined as nameval[1] not nameval[]. Hence we need to subtract 1 from the calculation. This can be shown by: # touch file # setfattr -n root.a file and verifications will fail when it's written to disk. This only matters for a last attribute which has a single-byte name and no value, otherwise the combination of namelen & valuelen will push endp further out and this test won't fail. Fixes: 1e1bbd8 ("xfs: create structure verifier function for shortform xattrs") Signed-off-by: Eric Sandeen <[email protected]> Reviewed-by: Darrick J. Wong <[email protected]> Signed-off-by: Darrick J. Wong <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent fd7b073 commit 017265f

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

fs/xfs/libxfs/xfs_attr_leaf.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -935,8 +935,10 @@ xfs_attr_shortform_verify(
935935
* struct xfs_attr_sf_entry has a variable length.
936936
* Check the fixed-offset parts of the structure are
937937
* within the data buffer.
938+
* xfs_attr_sf_entry is defined with a 1-byte variable
939+
* array at the end, so we must subtract that off.
938940
*/
939-
if (((char *)sfep + sizeof(*sfep)) >= endp)
941+
if (((char *)sfep + sizeof(*sfep) - 1) >= endp)
940942
return __this_address;
941943

942944
/* Don't allow names with known bad length. */

0 commit comments

Comments
 (0)