[pve-devel] r5174 - pve-kernel-2.6.32/trunk
svn-commits at proxmox.com
svn-commits at proxmox.com
Fri Sep 17 15:43:31 CEST 2010
Author: dietmar
Date: 2010-09-17 13:43:31 +0000 (Fri, 17 Sep 2010)
New Revision: 5174
Added:
pve-kernel-2.6.32/trunk/security-fix1.patch
Modified:
pve-kernel-2.6.32/trunk/Makefile
pve-kernel-2.6.32/trunk/changelog.Debian
Log:
Modified: pve-kernel-2.6.32/trunk/Makefile
===================================================================
--- pve-kernel-2.6.32/trunk/Makefile 2010-09-17 12:05:00 UTC (rev 5173)
+++ pve-kernel-2.6.32/trunk/Makefile 2010-09-17 13:43:31 UTC (rev 5174)
@@ -3,7 +3,7 @@
KERNEL_VER=2.6.32
KERNEL_DEB_REL=22
-PKGREL=16
+PKGREL=17
KREL=3
EXTRAVERSION=-${KREL}-pve
@@ -122,6 +122,8 @@
rm -rf ${KERNEL_SRC}
tar xf ${KERNEL_SRC_TAR}
zcat ${KERNEL_DEB_DIFF}|patch -p1 -d ${KERNEL_SRC}
+ # fix CVE-2010-3081
+ cd ${KERNEL_SRC}; patch -p1 <../security-fix1.patch
./applydebpatches.pl ${KERNEL_SRC} ${KERNEL_DEB_REL}
cd ${KERNEL_SRC}; patch -p1 <../bootsplash-3.1.9-2.6.31.patch
cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
Modified: pve-kernel-2.6.32/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32/trunk/changelog.Debian 2010-09-17 12:05:00 UTC (rev 5173)
+++ pve-kernel-2.6.32/trunk/changelog.Debian 2010-09-17 13:43:31 UTC (rev 5174)
@@ -1,3 +1,9 @@
+pve-kernel-2.6.32 (2.6.32-17) unstable; urgency=low
+
+ * fix CVE-2010-3081 kernel
+
+ -- Proxmox Support Team <support at proxmox.com> Fri, 17 Sep 2010 15:42:14 +0200
+
pve-kernel-2.6.32 (2.6.32-16) unstable; urgency=low
* include latest ixgbe driver
Added: pve-kernel-2.6.32/trunk/security-fix1.patch
===================================================================
--- pve-kernel-2.6.32/trunk/security-fix1.patch (rev 0)
+++ pve-kernel-2.6.32/trunk/security-fix1.patch 2010-09-17 13:43:31 UTC (rev 5174)
@@ -0,0 +1,175 @@
+commit c41d68a513c71e35a14f66d71782d27a79a81ea6
+Author: H. Peter Anvin <hpa at linux.intel.com>
+Date: Tue Sep 7 16:16:18 2010 -0700
+
+ I fixed compat.h manually for the PVE build (dietmar at proxmox.com)
+
+ compat: Make compat_alloc_user_space() incorporate the access_ok()
+
+ compat_alloc_user_space() expects the caller to independently call
+ access_ok() to verify the returned area. A missing call could
+ introduce problems on some architectures.
+
+ This patch incorporates the access_ok() check into
+ compat_alloc_user_space() and also adds a sanity check on the length.
+ The existing compat_alloc_user_space() implementations are renamed
+ arch_compat_alloc_user_space() and are used as part of the
+ implementation of the new global function.
+
+ This patch assumes NULL will cause __get_user()/__put_user() to either
+ fail or access userspace on all architectures. This should be
+ followed by checking the return value of compat_access_user_space()
+ for NULL in the callers, at which time the access_ok() in the callers
+ can also be removed.
+
+ Reported-by: Ben Hawkes <hawkes at sota.gen.nz>
+ Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
+ Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
+ Acked-by: Chris Metcalf <cmetcalf at tilera.com>
+ Acked-by: David S. Miller <davem at davemloft.net>
+ Acked-by: Ingo Molnar <mingo at elte.hu>
+ Acked-by: Thomas Gleixner <tglx at linutronix.de>
+ Acked-by: Tony Luck <tony.luck at intel.com>
+ Cc: Andrew Morton <akpm at linux-foundation.org>
+ Cc: Arnd Bergmann <arnd at arndb.de>
+ Cc: Fenghua Yu <fenghua.yu at intel.com>
+ Cc: H. Peter Anvin <hpa at zytor.com>
+ Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
+ Cc: Helge Deller <deller at gmx.de>
+ Cc: James Bottomley <jejb at parisc-linux.org>
+ Cc: Kyle McMartin <kyle at mcmartin.ca>
+ Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
+ Cc: Paul Mackerras <paulus at samba.org>
+ Cc: Ralf Baechle <ralf at linux-mips.org>
+ Cc: <stable at kernel.org>
+
+diff --git a/arch/ia64/include/asm/compat.h b/arch/ia64/include/asm/compat.h
+index f90edc8..9301a28 100644
+--- a/arch/ia64/include/asm/compat.h
++++ b/arch/ia64/include/asm/compat.h
+@@ -199,7 +199,7 @@ ptr_to_compat(void __user *uptr)
+ }
+
+ static __inline__ void __user *
+-compat_alloc_user_space (long len)
++arch_compat_alloc_user_space (long len)
+ {
+ struct pt_regs *regs = task_pt_regs(current);
+ return (void __user *) (((regs->r12 & 0xffffffff) & -16) - len);
+diff --git a/arch/mips/include/asm/compat.h b/arch/mips/include/asm/compat.h
+index 613f691..dbc5106 100644
+--- a/arch/mips/include/asm/compat.h
++++ b/arch/mips/include/asm/compat.h
+@@ -145,7 +145,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)
+ return (u32)(unsigned long)uptr;
+ }
+
+-static inline void __user *compat_alloc_user_space(long len)
++static inline void __user *arch_compat_alloc_user_space(long len)
+ {
+ struct pt_regs *regs = (struct pt_regs *)
+ ((unsigned long) current_thread_info() + THREAD_SIZE - 32) - 1;
+diff --git a/arch/parisc/include/asm/compat.h b/arch/parisc/include/asm/compat.h
+index 02b77ba..efa0b60 100644
+--- a/arch/parisc/include/asm/compat.h
++++ b/arch/parisc/include/asm/compat.h
+@@ -147,7 +147,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)
+ return (u32)(unsigned long)uptr;
+ }
+
+-static __inline__ void __user *compat_alloc_user_space(long len)
++static __inline__ void __user *arch_compat_alloc_user_space(long len)
+ {
+ struct pt_regs *regs = ¤t->thread.regs;
+ return (void __user *)regs->gr[30];
+diff --git a/arch/powerpc/include/asm/compat.h b/arch/powerpc/include/asm/compat.h
+index 396d21a..a11d4ea 100644
+--- a/arch/powerpc/include/asm/compat.h
++++ b/arch/powerpc/include/asm/compat.h
+@@ -134,7 +134,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)
+ return (u32)(unsigned long)uptr;
+ }
+
+-static inline void __user *compat_alloc_user_space(long len)
++static inline void __user *arch_compat_alloc_user_space(long len)
+ {
+ struct pt_regs *regs = current->thread.regs;
+ unsigned long usp = regs->gpr[1];
+diff --git a/arch/s390/include/asm/compat.h b/arch/s390/include/asm/compat.h
+index 104f200..a875c2f 100644
+--- a/arch/s390/include/asm/compat.h
++++ b/arch/s390/include/asm/compat.h
+@@ -181,7 +181,7 @@ static inline int is_compat_task(void)
+
+ #endif
+
+-static inline void __user *compat_alloc_user_space(long len)
++static inline void __user *arch_compat_alloc_user_space(long len)
+ {
+ unsigned long stack;
+
+diff --git a/arch/sparc/include/asm/compat.h b/arch/sparc/include/asm/compat.h
+index 5016f76..6f57325 100644
+--- a/arch/sparc/include/asm/compat.h
++++ b/arch/sparc/include/asm/compat.h
+@@ -167,7 +167,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)
+ return (u32)(unsigned long)uptr;
+ }
+
+-static inline void __user *compat_alloc_user_space(long len)
++static inline void __user *arch_compat_alloc_user_space(long len)
+ {
+ struct pt_regs *regs = current_thread_info()->kregs;
+ unsigned long usp = regs->u_regs[UREG_I6];
+diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
+index 306160e..1d9cd27 100644
+--- a/arch/x86/include/asm/compat.h
++++ b/arch/x86/include/asm/compat.h
+@@ -205,7 +205,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)
+ return (u32)(unsigned long)uptr;
+ }
+
+-static inline void __user *compat_alloc_user_space(long len)
++static inline void __user *arch_compat_alloc_user_space(long len)
+ {
+ struct pt_regs *regs = task_pt_regs(current);
+ return (void __user *)regs->sp - len;
+diff --git a/kernel/compat.c b/kernel/compat.c
+index e167efc..c9e2ec0 100644
+--- a/kernel/compat.c
++++ b/kernel/compat.c
+@@ -1126,3 +1126,24 @@ compat_sys_sysinfo(struct compat_sysinfo __user *info)
+
+ return 0;
+ }
++
++/*
++ * Allocate user-space memory for the duration of a single system call,
++ * in order to marshall parameters inside a compat thunk.
++ */
++void __user *compat_alloc_user_space(unsigned long len)
++{
++ void __user *ptr;
++
++ /* If len would occupy more than half of the entire compat space... */
++ if (unlikely(len > (((compat_uptr_t)~0) >> 1)))
++ return NULL;
++
++ ptr = arch_compat_alloc_user_space(len);
++
++ if (unlikely(!access_ok(VERIFY_WRITE, ptr, len)))
++ return NULL;
++
++ return ptr;
++}
++EXPORT_SYMBOL_GPL(compat_alloc_user_space);
+--- linux-2.6-2.6.32/include/linux/compat.h.orig 2009-12-03 04:51:21.000000000 +0100
++++ linux-2.6-2.6.32/include/linux/compat.h 2010-09-17 15:34:13.000000000 +0200
+@@ -309,5 +309,7 @@
+ asmlinkage long compat_sys_openat(unsigned int dfd, const char __user *filename,
+ int flags, int mode);
+
++extern void __user *compat_alloc_user_space(unsigned long len);
++
+ #endif /* CONFIG_COMPAT */
+ #endif /* _LINUX_COMPAT_H */
More information about the pve-devel
mailing list