Commit 6eb0b8df authored by Darrick J. Wong's avatar Darrick J. Wong

xfs: rename MAXPATHLEN to XFS_SYMLINK_MAXLEN

XFS has a maximum symlink target length of 1024 bytes; this is a
holdover from the Irix days.  Unfortunately, the constant establishing
this is 'MAXPATHLEN' and is /not/ the same as the Linux MAXPATHLEN,
which is 4096.

The kernel enforces its 1024 byte MAXPATHLEN on symlink targets, but
xfsprogs picks up the (Linux) system 4096 byte MAXPATHLEN, which means
that xfs_repair doesn't complain about oversized symlinks.

Since this is an on-disk format constraint, put the define in the XFS
namespace and move everything over to use the new name.
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
parent 2192b0ba
...@@ -1211,6 +1211,7 @@ struct xfs_dsymlink_hdr { ...@@ -1211,6 +1211,7 @@ struct xfs_dsymlink_hdr {
#define XFS_SYMLINK_CRC_OFF offsetof(struct xfs_dsymlink_hdr, sl_crc) #define XFS_SYMLINK_CRC_OFF offsetof(struct xfs_dsymlink_hdr, sl_crc)
#define XFS_SYMLINK_MAXLEN 1024
/* /*
* The maximum pathlen is 1024 bytes. Since the minimum file system * The maximum pathlen is 1024 bytes. Since the minimum file system
* blocksize is 512 bytes, we can get a max of 3 extents back from * blocksize is 512 bytes, we can get a max of 3 extents back from
......
...@@ -114,7 +114,7 @@ xfs_symlink_verify( ...@@ -114,7 +114,7 @@ xfs_symlink_verify(
if (bp->b_bn != be64_to_cpu(dsl->sl_blkno)) if (bp->b_bn != be64_to_cpu(dsl->sl_blkno))
return false; return false;
if (be32_to_cpu(dsl->sl_offset) + if (be32_to_cpu(dsl->sl_offset) +
be32_to_cpu(dsl->sl_bytes) >= MAXPATHLEN) be32_to_cpu(dsl->sl_bytes) >= XFS_SYMLINK_MAXLEN)
return false; return false;
if (dsl->sl_owner == 0) if (dsl->sl_owner == 0)
return false; return false;
......
...@@ -477,14 +477,14 @@ xfs_calc_mkdir_reservation( ...@@ -477,14 +477,14 @@ xfs_calc_mkdir_reservation(
/* /*
* Making a new symplink is the same as creating a new file, but * Making a new symplink is the same as creating a new file, but
* with the added blocks for remote symlink data which can be up to 1kB in * with the added blocks for remote symlink data which can be up to 1kB in
* length (MAXPATHLEN). * length (XFS_SYMLINK_MAXLEN).
*/ */
STATIC uint STATIC uint
xfs_calc_symlink_reservation( xfs_calc_symlink_reservation(
struct xfs_mount *mp) struct xfs_mount *mp)
{ {
return xfs_calc_create_reservation(mp) + return xfs_calc_create_reservation(mp) +
xfs_calc_buf_res(1, MAXPATHLEN); xfs_calc_buf_res(1, XFS_SYMLINK_MAXLEN);
} }
/* /*
......
...@@ -460,7 +460,7 @@ xfs_vn_get_link( ...@@ -460,7 +460,7 @@ xfs_vn_get_link(
if (!dentry) if (!dentry)
return ERR_PTR(-ECHILD); return ERR_PTR(-ECHILD);
link = kmalloc(MAXPATHLEN+1, GFP_KERNEL); link = kmalloc(XFS_SYMLINK_MAXLEN+1, GFP_KERNEL);
if (!link) if (!link)
goto out_err; goto out_err;
......
...@@ -143,7 +143,6 @@ typedef __u32 xfs_nlink_t; ...@@ -143,7 +143,6 @@ typedef __u32 xfs_nlink_t;
#define __return_address __builtin_return_address(0) #define __return_address __builtin_return_address(0)
#define XFS_PROJID_DEFAULT 0 #define XFS_PROJID_DEFAULT 0
#define MAXPATHLEN 1024
#define MIN(a,b) (min(a,b)) #define MIN(a,b) (min(a,b))
#define MAX(a,b) (max(a,b)) #define MAX(a,b) (max(a,b))
......
...@@ -143,7 +143,7 @@ xfs_readlink( ...@@ -143,7 +143,7 @@ xfs_readlink(
if (!pathlen) if (!pathlen)
goto out; goto out;
if (pathlen < 0 || pathlen > MAXPATHLEN) { if (pathlen < 0 || pathlen > XFS_SYMLINK_MAXLEN) {
xfs_alert(mp, "%s: inode (%llu) bad symlink length (%lld)", xfs_alert(mp, "%s: inode (%llu) bad symlink length (%lld)",
__func__, (unsigned long long) ip->i_ino, __func__, (unsigned long long) ip->i_ino,
(long long) pathlen); (long long) pathlen);
...@@ -202,7 +202,7 @@ xfs_symlink( ...@@ -202,7 +202,7 @@ xfs_symlink(
* Check component lengths of the target path name. * Check component lengths of the target path name.
*/ */
pathlen = strlen(target_path); pathlen = strlen(target_path);
if (pathlen >= MAXPATHLEN) /* total string too long */ if (pathlen >= XFS_SYMLINK_MAXLEN) /* total string too long */
return -ENAMETOOLONG; return -ENAMETOOLONG;
udqp = gdqp = NULL; udqp = gdqp = NULL;
...@@ -559,7 +559,7 @@ xfs_inactive_symlink( ...@@ -559,7 +559,7 @@ xfs_inactive_symlink(
return 0; return 0;
} }
if (pathlen < 0 || pathlen > MAXPATHLEN) { if (pathlen < 0 || pathlen > XFS_SYMLINK_MAXLEN) {
xfs_alert(mp, "%s: inode (0x%llx) bad symlink length (%d)", xfs_alert(mp, "%s: inode (0x%llx) bad symlink length (%d)",
__func__, (unsigned long long)ip->i_ino, pathlen); __func__, (unsigned long long)ip->i_ino, pathlen);
xfs_iunlock(ip, XFS_ILOCK_EXCL); xfs_iunlock(ip, XFS_ILOCK_EXCL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment