diff options
Diffstat (limited to 'patches/source/linux-2.6.33.4/kernel.CVE-2010-3081.diff')
| -rw-r--r-- | patches/source/linux-2.6.33.4/kernel.CVE-2010-3081.diff | 169 |
1 files changed, 169 insertions, 0 deletions
diff --git a/patches/source/linux-2.6.33.4/kernel.CVE-2010-3081.diff b/patches/source/linux-2.6.33.4/kernel.CVE-2010-3081.diff new file mode 100644 index 00000000..67fd987d --- /dev/null +++ b/patches/source/linux-2.6.33.4/kernel.CVE-2010-3081.diff @@ -0,0 +1,169 @@ +From c41d68a513c71e35a14f66d71782d27a79a81ea6 Mon Sep 17 00:00:00 2001 +From: H. Peter Anvin <hpa@linux.intel.com> +Date: Tue, 7 Sep 2010 16:16:18 -0700 +Subject: [PATCH] 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@sota.gen.nz> +Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> +Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> +Acked-by: Chris Metcalf <cmetcalf@tilera.com> +Acked-by: David S. Miller <davem@davemloft.net> +Acked-by: Ingo Molnar <mingo@elte.hu> +Acked-by: Thomas Gleixner <tglx@linutronix.de> +Acked-by: Tony Luck <tony.luck@intel.com> +Cc: Andrew Morton <akpm@linux-foundation.org> +Cc: Arnd Bergmann <arnd@arndb.de> +Cc: Fenghua Yu <fenghua.yu@intel.com> +Cc: H. Peter Anvin <hpa@zytor.com> +Cc: Heiko Carstens <heiko.carstens@de.ibm.com> +Cc: Helge Deller <deller@gmx.de> +Cc: James Bottomley <jejb@parisc-linux.org> +Cc: Kyle McMartin <kyle@mcmartin.ca> +Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> +Cc: Paul Mackerras <paulus@samba.org> +Cc: Ralf Baechle <ralf@linux-mips.org> +Cc: <stable@kernel.org> +--- + arch/ia64/include/asm/compat.h | 2 +- + arch/mips/include/asm/compat.h | 2 +- + arch/parisc/include/asm/compat.h | 2 +- + arch/powerpc/include/asm/compat.h | 2 +- + arch/s390/include/asm/compat.h | 2 +- + arch/sparc/include/asm/compat.h | 2 +- + arch/tile/include/asm/compat.h | 2 +- + arch/x86/include/asm/compat.h | 2 +- + include/linux/compat.h | 3 +++ + kernel/compat.c | 21 +++++++++++++++++++++ + 10 files changed, 32 insertions(+), 8 deletions(-) + +--- ./kernel/compat.c.orig 2010-07-28 16:16:40.774916889 -0500 ++++ ./kernel/compat.c 2010-09-20 21:54:37.767308329 -0500 +@@ -1139,3 +1139,24 @@ + + 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); +--- ./arch/x86/include/asm/compat.h.orig 2010-07-28 16:16:47.101918489 -0500 ++++ ./arch/x86/include/asm/compat.h 2010-09-20 21:54:37.750819535 -0500 +@@ -204,7 +204,7 @@ + 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; +--- ./arch/ia64/include/asm/compat.h.orig 2010-07-28 16:16:47.645915729 -0500 ++++ ./arch/ia64/include/asm/compat.h 2010-09-20 21:54:35.635808962 -0500 +@@ -198,7 +198,7 @@ + } + + 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); +--- ./arch/powerpc/include/asm/compat.h.orig 2010-07-28 16:16:50.286915689 -0500 ++++ ./arch/powerpc/include/asm/compat.h 2010-09-20 21:54:35.635808962 -0500 +@@ -133,7 +133,7 @@ + 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]; +--- ./arch/sparc/include/asm/compat.h.orig 2010-07-28 16:16:51.303918489 -0500 ++++ ./arch/sparc/include/asm/compat.h 2010-09-20 21:54:35.636808219 -0500 +@@ -166,7 +166,7 @@ + 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]; +--- ./arch/parisc/include/asm/compat.h.orig 2010-07-28 16:16:52.035916329 -0500 ++++ ./arch/parisc/include/asm/compat.h 2010-09-20 21:54:35.635808962 -0500 +@@ -146,7 +146,7 @@ + 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]; +--- ./arch/s390/include/asm/compat.h.orig 2010-07-28 16:16:52.308915929 -0500 ++++ ./arch/s390/include/asm/compat.h 2010-09-20 21:54:35.635808962 -0500 +@@ -180,7 +180,7 @@ + + #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; + +--- ./arch/mips/include/asm/compat.h.orig 2010-07-28 16:16:53.603915849 -0500 ++++ ./arch/mips/include/asm/compat.h 2010-09-20 21:54:35.635808962 -0500 +@@ -144,7 +144,7 @@ + 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; +--- ./include/linux/compat.h.orig 2010-07-28 16:16:56.000000000 -0500 ++++ ./include/linux/compat.h 2010-09-20 21:55:20.334819232 -0500 +@@ -353,5 +353,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 */ + |