[Top] [All Lists]

[PATCH 5/6] xfs: Fix possible memory corruption in xfs_readlink

To: stable@xxxxxxxxxxxxxxx, greg@xxxxxxxxx
Subject: [PATCH 5/6] xfs: Fix possible memory corruption in xfs_readlink
From: Ben Myers <bpm@xxxxxxx>
Date: Thu, 1 Dec 2011 17:27:43 -0600
Cc: xfs@xxxxxxxxxxx, bpm@xxxxxxx, Carlos Maiolino <cmaiolino@xxxxxxxxxx>, Alex Elder <aelder@xxxxxxx>
In-reply-to: <1322782064-1723-1-git-send-email-bpm@xxxxxxx>
References: <1322782064-1723-1-git-send-email-bpm@xxxxxxx>
From: Carlos Maiolino <cmaiolino@xxxxxxxxxx>

commit b52a360b2aa1c59ba9970fb0f52bbb093fcc7a24 upstream.

Fixes a possible memory corruption when the link is larger than
MAXPATHLEN and XFS_DEBUG is not enabled. This also remove the
S_ISLNK assert, since the inode mode is checked previously in
xfs_readlink_by_handle() and via VFS.

Updated to address concerns raised by Ben Hutchings about the loose
attention paid to 32- vs 64-bit values, and the lack of handling a
potentially negative pathlen value:
 - Changed type of "pathlen" to be xfs_fsize_t, to match that of
 - Added checking for a negative pathlen to the too-long pathlen
   test, and generalized the message that gets reported in that case
   to reflect the change
As a result, if a negative pathlen were encountered, this function
would return EFSCORRUPTED (and would fail an assertion for a debug
build)--just as would a too-long pathlen.

Signed-off-by: Alex Elder <aelder@xxxxxxx>
Signed-off-by: Carlos Maiolino <cmaiolino@xxxxxxxxxx>
Reviewed-by: Christoph Hellwig <hch@xxxxxx>
 fs/xfs/xfs_vnodeops.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index 51fc429..b9e2873 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -113,7 +113,7 @@ xfs_readlink(
        char            *link)
        xfs_mount_t     *mp = ip->i_mount;
-       int             pathlen;
+       xfs_fsize_t     pathlen;
        int             error = 0;
@@ -123,13 +123,19 @@ xfs_readlink(
        xfs_ilock(ip, XFS_ILOCK_SHARED);
-       ASSERT(S_ISLNK(ip->i_d.di_mode));
-       ASSERT(ip->i_d.di_size <= MAXPATHLEN);
        pathlen = ip->i_d.di_size;
        if (!pathlen)
                goto out;
+       if (pathlen < 0 || pathlen > MAXPATHLEN) {
+               xfs_alert(mp, "%s: inode (%llu) bad symlink length (%lld)",
+                        __func__, (unsigned long long) ip->i_ino,
+                        (long long) pathlen);
+               ASSERT(0);
+               return XFS_ERROR(EFSCORRUPTED);
+       }
        if (ip->i_df.if_flags & XFS_IFINLINE) {
                memcpy(link, ip->i_df.if_u1.if_data, pathlen);
                link[pathlen] = '\0';

<Prev in Thread] Current Thread [Next in Thread>