diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-07-30 18:01:37 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-07-30 18:01:37 -0400 |
| commit | c8db06dd9588cdc33f22e759290307df10a7cbe7 (patch) | |
| tree | 84f37d1b09d3254b028a98d4b6f024d4cc8eb44e | |
| parent | 129ee840ba66e4b583f7bd0629e145117cb37638 (diff) | |
| download | longterm-queue-2.6.34-c8db06dd9588cdc33f22e759290307df10a7cbe7.tar.gz | |
fix compile error in xfs due to missing xfs_alert
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/xfs-Fix-possible-memory-corruption-in-xfs_readlink.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/queue/xfs-Fix-possible-memory-corruption-in-xfs_readlink.patch b/queue/xfs-Fix-possible-memory-corruption-in-xfs_readlink.patch index 4c491aa..34936f0 100644 --- a/queue/xfs-Fix-possible-memory-corruption-in-xfs_readlink.patch +++ b/queue/xfs-Fix-possible-memory-corruption-in-xfs_readlink.patch @@ -1,4 +1,4 @@ -From 64a251ab341c86e6715912e1b01a89627ae56148 Mon Sep 17 00:00:00 2001 +From b606c48716764d2c6457881bc853759379f8fed3 Mon Sep 17 00:00:00 2001 From: Carlos Maiolino <cmaiolino@redhat.com> Date: Mon, 7 Nov 2011 16:10:24 +0000 Subject: [PATCH] xfs: Fix possible memory corruption in xfs_readlink @@ -25,10 +25,11 @@ build)--just as would a too-long pathlen. Signed-off-by: Alex Elder <aelder@sgi.com> Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> +[PG: no xfs_alert in 2.6.34; use xfs_fs_cmn_err(CE_ALERT, ...) instead] Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c -index 4498f07..3ae59ee 100644 +index 4498f07..c682c5d 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c @@ -554,7 +554,7 @@ xfs_readlink( @@ -52,9 +53,9 @@ index 4498f07..3ae59ee 100644 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); ++ xfs_fs_cmn_err(CE_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); + } @@ -64,5 +65,5 @@ index 4498f07..3ae59ee 100644 memcpy(link, ip->i_df.if_u1.if_data, pathlen); link[pathlen] = '\0'; -- -1.7.9.7 +1.7.11.1 |