xfs_repair: fix symlink target length checks by changing 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 was '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.  As a side effect of the rename, xfs_repair wil detect
oversized symlinks and clean them off the system.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/repair/dinode.c b/repair/dinode.c
index da8721787b55bcba059c9c344ad9e8c06929dde3..f0053358dac2aac4159cd6d0848a410eabb32b50 100644 (file)
--- a/repair/dinode.c
+++ b/repair/dinode.c
@@ -1259,7 +1259,7 @@ null_check(char *name, int length)
 {
        int i;
 
-       ASSERT(length < MAXPATHLEN);
+       ASSERT(length < XFS_SYMLINK_MAXLEN);
 
        for (i = 0; i < length; i++, name++)  {
                if (*name == '\0')
@@ -1371,7 +1371,7 @@ process_symlink(
        blkmap_t        *blkmap)
 {
        char                    *symlink;
-       char                    data[MAXPATHLEN];
+       char                    data[XFS_SYMLINK_MAXLEN];
 
        /*
         * check size against kernel symlink limits.  we know
@@ -1379,7 +1379,7 @@ process_symlink(
         * the inode is structurally ok so we don't have to check
         * for that
         */
-       if (be64_to_cpu(dino->di_size) >= MAXPATHLEN)  {
+       if (be64_to_cpu(dino->di_size) >= XFS_SYMLINK_MAXLEN)  {
               do_warn(_("symlink in inode %" PRIu64 " too long (%llu chars)\n"),
                       lino, (unsigned long long) be64_to_cpu(dino->di_size));
                return(1);

diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index ab60c0faaff5cdce6a6874d895335140c7f382c2..b2dd91b5252757f4858984a2d7bdf2a9d6ff11a7 100644 (file)
--- a/repair/xfs_repair.c
+++ b/repair/xfs_repair.c
@@ -761,7 +761,7 @@ main(int argc, char **argv)
        glob_agcount = mp->m_sb.sb_agcount;
 
        chunks_pblock = mp->m_sb.sb_inopblock / XFS_INODES_PER_CHUNK;
-       max_symlink_blocks = libxfs_symlink_blocks(mp, MAXPATHLEN);
+       max_symlink_blocks = libxfs_symlink_blocks(mp, XFS_SYMLINK_MAXLEN);
        inodes_per_cluster = MAX(mp->m_sb.sb_inopblock,
                        mp->m_inode_cluster_size >> mp->m_sb.sb_inodelog);