Author: arekm Date: Mon Nov 7 16:26:37 2011 GMT
Module: packages Tag: LINUX_3_0
---- Log message:
- revert xfs link mem corruption fix; waiting for some form to be commited
upstream
---- Files affected:
packages/kernel:
kernel-small_fixes.patch (1.43.2.2 -> 1.43.2.3)
---- Diffs:
================================================================
Index: packages/kernel/kernel-small_fixes.patch
diff -u packages/kernel/kernel-small_fixes.patch:1.43.2.2
packages/kernel/kernel-small_fixes.patch:1.43.2.3
--- packages/kernel/kernel-small_fixes.patch:1.43.2.2 Mon Oct 31 22:37:28 2011
+++ packages/kernel/kernel-small_fixes.patch Mon Nov 7 17:26:32 2011
@@ -407,51 +407,6 @@
trace_xfs_file_read(ip, size, iocb->ki_pos, ioflags);
-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.
-
-Signed-off-by: Carlos Maiolino <[email protected]>
----
- fs/xfs/xfs_vnodeops.c | 11 ++++++++---
- 1 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
-index 51fc429..c3288be 100644
---- a/fs/xfs/xfs_vnodeops.c
-+++ b/fs/xfs/xfs_vnodeops.c
-@@ -123,13 +123,18 @@ xfs_readlink(
-
- xfs_ilock(ip, XFS_ILOCK_SHARED);
-
-- ASSERT((ip->i_d.di_mode & S_IFMT) == S_IFLNK);
-- ASSERT(ip->i_d.di_size <= MAXPATHLEN);
--
- pathlen = ip->i_d.di_size;
- if (!pathlen)
- goto out;
-
-+ if (pathlen > MAXPATHLEN) {
-+ xfs_alert(mp, "%s: inode (%llu) symlink length (%d) too long",
-+ __func__, (unsigned long long)ip->i_ino, 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';
---
-1.7.6.2
-
-_______________________________________________
-xfs mailing list
[email protected]
-http://oss.sgi.com/mailman/listinfo/xfs
-
-
An integer overflow will happen on 64bit archs if task's sum of rss, swapents
and nr_ptes exceeds (2^31)/1000 value. This was introduced by commit
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-small_fixes.patch?r1=1.43.2.2&r2=1.43.2.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
