diff --git a/kernel.spec b/kernel.spec index cc95ef6f7..4d3d22343 100644 --- a/kernel.spec +++ b/kernel.spec @@ -48,7 +48,7 @@ Summary: The Linux kernel # reset this by hand to 1 (or to 0 and then use rpmdev-bumpspec). # scripts/rebase.sh should be made to do that for you, actually. # -%global baserelease 102 +%global baserelease 103 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -2313,7 +2313,8 @@ fi # and build. %changelog -* Thu Oct 27 2011 Josh Boyer +* Thu Oct 27 2011 Josh Boyer 2.6.35.14-103 +- Fix backport of xfs patch - CVE-2011-4081 crypto: ghash: null pointer deref if no key is set (rhbz 749484) * Wed Oct 26 2011 Josh Boyer diff --git a/xfs-Fix-possible-memory-corruption-in-xfs_readlink.patch b/xfs-Fix-possible-memory-corruption-in-xfs_readlink.patch index 319f80dc5..f22cd4c6d 100644 --- a/xfs-Fix-possible-memory-corruption-in-xfs_readlink.patch +++ b/xfs-Fix-possible-memory-corruption-in-xfs_readlink.patch @@ -1,4 +1,4 @@ -From cbee73333a2d05c274240dff5de1b4bb74bfb497 Mon Sep 17 00:00:00 2001 +From fbf6404575f42b383d9607321bd129f0e28fc0d7 Mon Sep 17 00:00:00 2001 From: Carlos Maiolino Date: Tue, 18 Oct 2011 02:18:58 -0200 Subject: [PATCH] Fix possible memory corruption in xfs_readlink @@ -14,10 +14,10 @@ Signed-off-by: Carlos Maiolino 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c -index 6197207..111870b 100644 +index c164683..529d983 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c -@@ -545,13 +545,17 @@ xfs_readlink( +@@ -564,13 +564,17 @@ xfs_readlink( xfs_ilock(ip, XFS_ILOCK_SHARED); @@ -29,7 +29,7 @@ index 6197207..111870b 100644 goto out; + if (pathlen > MAXPATHLEN) { -+ xfs_alert(mp, "%s: inode (%llu) symlink length (%d) too long", ++ xfs_fs_cmn_err(CE_ALERT, mp, "%s: inode (%llu) symlink length (%d) too long", + __func__, (unsigned long long)ip->i_ino, pathlen); + ASSERT(0); + return XFS_ERROR(EFSCORRUPTED);