Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51fcbfe7 authored by Jan Tulak's avatar Jan Tulak Committed by Dave Chinner
Browse files

xfs: avoid dependency on Linux XATTR_SIZE_MAX 



Currently, we depends on Linux XATTR value for on disk
definition. Which causes trouble on other platforms and
maybe also if this value was to change.

Fix it by creating a custom definition independent from
those in Linux (although with the same values), so it is OK
with the be16 fields used for holding these attributes.

This patch reflects a change in xfsprogs.

Signed-off-by: default avatarJan Tulak <jtulak@redhat.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 4e247614

fs/xfs/libxfs/xfs_attr_remote.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ xfs_attr3_rmt_verify( 
	if (be32_to_cpu(rmt->rm_bytes) > fsbsize - sizeof(*rmt))

		return false;

	if (be32_to_cpu(rmt->rm_offset) +

				be32_to_cpu(rmt->rm_bytes) > XATTR_SIZE_MAX)

				be32_to_cpu(rmt->rm_bytes) > XFS_XATTR_SIZE_MAX)

		return false;

	if (rmt->rm_owner == 0)

		return false;

fs/xfs/libxfs/xfs_format.h

+9 −1
Original line number Diff line number Diff line
@@ -59,6 +59,14 @@ struct xfs_ifork; 
#define	XFS_SB_VERSION_BORGBIT		0x4000	/* ASCII only case-insens. */

#define	XFS_SB_VERSION_MOREBITSBIT	0x8000



/*

 * The size of a single extended attribute on disk is limited by

 * the size of index values within the attribute entries themselves.

 * These are be16 fields, so we can only support attribute data

 * sizes up to 2^16 bytes in length.

 */

#define XFS_XATTR_SIZE_MAX (1 << 16)



/*

 * Supported feature bit list is just all bits in the versionnum field because

 * we've used them all up and understand them all. Except, of course, for the
@@ -1483,7 +1491,7 @@ struct xfs_acl { 
 */

#define XFS_ACL_MAX_ENTRIES(mp)	\

	(xfs_sb_version_hascrc(&mp->m_sb) \

		?  (XATTR_SIZE_MAX - sizeof(struct xfs_acl)) / \

		?  (XFS_XATTR_SIZE_MAX - sizeof(struct xfs_acl)) / \

						sizeof(struct xfs_acl_entry) \

		: 25)

fs/xfs/xfs_ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ xfs_attrmulti_attr_get( 
	unsigned char		*kbuf;

	int			error = -EFAULT;



	if (*len > XATTR_SIZE_MAX)

	if (*len > XFS_XATTR_SIZE_MAX)

		return -EINVAL;

	kbuf = kmem_zalloc_large(*len, KM_SLEEP);

	if (!kbuf)
@@ -485,7 +485,7 @@ xfs_attrmulti_attr_set( 


	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))

		return -EPERM;

	if (len > XATTR_SIZE_MAX)

	if (len > XFS_XATTR_SIZE_MAX)

		return -EINVAL;



	kbuf = memdup_user(ubuf, len);