packages (Titanium): kernel-desktop/kernel-desktop-small_fixes.patch - patc...

shadzik shadzik at pld-linux.org
Tue Sep 21 10:16:41 CEST 2010 

Author: shadzik                      Date: Tue Sep 21 08:16:41 2010 GMT
Module: packages                      Tag: Titanium
---- Log message:
- patch already in .35.5

---- Files affected:
packages/kernel-desktop:
   kernel-desktop-small_fixes.patch (1.18.2.4 -> 1.18.2.5) 

---- Diffs:

================================================================
Index: packages/kernel-desktop/kernel-desktop-small_fixes.patch
diff -u packages/kernel-desktop/kernel-desktop-small_fixes.patch:1.18.2.4 packages/kernel-desktop/kernel-desktop-small_fixes.patch:1.18.2.5
--- packages/kernel-desktop/kernel-desktop-small_fixes.patch:1.18.2.4	Fri Sep 17 16:03:54 2010
+++ packages/kernel-desktop/kernel-desktop-small_fixes.patch	Tue Sep 21 10:16:36 2010
@@ -9,182 +9,3 @@
 +//#include "../../include/generated/autoconf.h"
  #include "../../include/linux/license.h"
  
- /* Some toolchains use a `_' prefix for all user symbols. */
-From: H. Peter Anvin <hpa at linux.intel.com>
-Date: Tue, 7 Sep 2010 23:16:18 +0000 (-0700)
-Subject: compat: Make compat_alloc_user_space() incorporate the access_ok()
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=c41d68a513c71e35a14f66d71782d27a79a81ea6
-
-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 = &current->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/include/linux/compat.h b/include/linux/compat.h
-index 9ddc878..5778b55 100644
---- a/include/linux/compat.h
-+++ b/include/linux/compat.h
-@@ -360,5 +360,8 @@ extern ssize_t compat_rw_copy_check_uvector(int type,
- 		const struct compat_iovec __user *uvector, unsigned long nr_segs,
- 		unsigned long fast_segs, struct iovec *fast_pointer,
- 		struct iovec **ret_pointer);
-+
-+extern void __user *compat_alloc_user_space(unsigned long len);
-+
- #endif /* CONFIG_COMPAT */
- #endif /* _LINUX_COMPAT_H */
-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);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-desktop/kernel-desktop-small_fixes.patch?r1=1.18.2.4&r2=1.18.2.5&f=u

More information about the pld-cvs-commit mailing list