remeove old ebuilds
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/genlink@2483 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
parent
290d04b8c1
commit
40af39b4e0
@ -1,122 +0,0 @@
|
|||||||
--- linux-2.6.33-sabayon.orig/arch/ia64/include/asm/compat.h
|
|
||||||
+++ linux-2.6.33-sabayon/arch/ia64/include/asm/compat.h
|
|
||||||
@@ -198,7 +198,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);
|
|
||||||
--- linux-2.6.33-sabayon.orig/arch/mips/include/asm/compat.h
|
|
||||||
+++ linux-2.6.33-sabayon/arch/mips/include/asm/compat.h
|
|
||||||
@@ -144,7 +144,7 @@ static inline compat_uptr_t ptr_to_compa
|
|
||||||
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;
|
|
||||||
--- linux-2.6.33-sabayon.orig/arch/parisc/include/asm/compat.h
|
|
||||||
+++ linux-2.6.33-sabayon/arch/parisc/include/asm/compat.h
|
|
||||||
@@ -146,7 +146,7 @@ static inline compat_uptr_t ptr_to_compa
|
|
||||||
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];
|
|
||||||
--- linux-2.6.33-sabayon.orig/arch/powerpc/include/asm/compat.h
|
|
||||||
+++ linux-2.6.33-sabayon/arch/powerpc/include/asm/compat.h
|
|
||||||
@@ -133,7 +133,7 @@ static inline compat_uptr_t ptr_to_compa
|
|
||||||
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];
|
|
||||||
--- linux-2.6.33-sabayon.orig/arch/s390/include/asm/compat.h
|
|
||||||
+++ linux-2.6.33-sabayon/arch/s390/include/asm/compat.h
|
|
||||||
@@ -180,7 +180,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;
|
|
||||||
|
|
||||||
--- linux-2.6.33-sabayon.orig/arch/sparc/include/asm/compat.h
|
|
||||||
+++ linux-2.6.33-sabayon/arch/sparc/include/asm/compat.h
|
|
||||||
@@ -166,7 +166,7 @@ static inline compat_uptr_t ptr_to_compa
|
|
||||||
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];
|
|
||||||
--- linux-2.6.33-sabayon.orig/arch/x86/include/asm/compat.h
|
|
||||||
+++ linux-2.6.33-sabayon/arch/x86/include/asm/compat.h
|
|
||||||
@@ -204,7 +204,7 @@ static inline compat_uptr_t ptr_to_compa
|
|
||||||
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;
|
|
||||||
--- linux-2.6.33-sabayon.orig/include/linux/compat.h
|
|
||||||
+++ linux-2.6.33-sabayon/include/linux/compat.h
|
|
||||||
@@ -353,5 +353,7 @@ asmlinkage long compat_sys_newfstatat(un
|
|
||||||
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 */
|
|
||||||
--- linux-2.6.33-sabayon.orig/kernel/compat.c
|
|
||||||
+++ linux-2.6.33-sabayon/kernel/compat.c
|
|
||||||
@@ -22,6 +22,7 @@
|
|
||||||
#include <linux/security.h>
|
|
||||||
#include <linux/timex.h>
|
|
||||||
#include <linux/migrate.h>
|
|
||||||
+#include <linux/module.h>
|
|
||||||
#include <linux/posix-timers.h>
|
|
||||||
#include <linux/times.h>
|
|
||||||
#include <linux/ptrace.h>
|
|
||||||
@@ -1139,3 +1140,24 @@ compat_sys_sysinfo(struct compat_sysinfo
|
|
||||||
|
|
||||||
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);
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
From eefdca043e8391dcd719711716492063030b55ac Mon Sep 17 00:00:00 2001
|
|
||||||
From: Roland McGrath <roland@redhat.com>
|
|
||||||
Date: Tue, 14 Sep 2010 12:22:58 -0700
|
|
||||||
Subject: x86-64, compat: Retruncate rax after ia32 syscall entry tracing
|
|
||||||
|
|
||||||
From: Roland McGrath <roland@redhat.com>
|
|
||||||
|
|
||||||
commit eefdca043e8391dcd719711716492063030b55ac upstream.
|
|
||||||
|
|
||||||
In commit d4d6715, we reopened an old hole for a 64-bit ptracer touching a
|
|
||||||
32-bit tracee in system call entry. A %rax value set via ptrace at the
|
|
||||||
entry tracing stop gets used whole as a 32-bit syscall number, while we
|
|
||||||
only check the low 32 bits for validity.
|
|
||||||
|
|
||||||
Fix it by truncating %rax back to 32 bits after syscall_trace_enter,
|
|
||||||
in addition to testing the full 64 bits as has already been added.
|
|
||||||
|
|
||||||
Reported-by: Ben Hawkes <hawkes@sota.gen.nz>
|
|
||||||
Signed-off-by: Roland McGrath <roland@redhat.com>
|
|
||||||
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
|
|
||||||
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
|
||||||
|
|
||||||
---
|
|
||||||
arch/x86/ia32/ia32entry.S | 8 +++++++-
|
|
||||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/arch/x86/ia32/ia32entry.S
|
|
||||||
+++ b/arch/x86/ia32/ia32entry.S
|
|
||||||
@@ -50,7 +50,12 @@
|
|
||||||
/*
|
|
||||||
* Reload arg registers from stack in case ptrace changed them.
|
|
||||||
* We don't reload %eax because syscall_trace_enter() returned
|
|
||||||
- * the value it wants us to use in the table lookup.
|
|
||||||
+ * the %rax value we should see. Instead, we just truncate that
|
|
||||||
+ * value to 32 bits again as we did on entry from user mode.
|
|
||||||
+ * If it's a new value set by user_regset during entry tracing,
|
|
||||||
+ * this matches the normal truncation of the user-mode value.
|
|
||||||
+ * If it's -1 to make us punt the syscall, then (u32)-1 is still
|
|
||||||
+ * an appropriately invalid value.
|
|
||||||
*/
|
|
||||||
.macro LOAD_ARGS32 offset, _r9=0
|
|
||||||
.if \_r9
|
|
||||||
@@ -60,6 +65,7 @@
|
|
||||||
movl \offset+48(%rsp),%edx
|
|
||||||
movl \offset+56(%rsp),%esi
|
|
||||||
movl \offset+64(%rsp),%edi
|
|
||||||
+ movl %eax,%eax /* zero extension */
|
|
||||||
.endm
|
|
||||||
|
|
||||||
.macro CFI_STARTPROC32 simple
|
|
||||||
@ -1,97 +0,0 @@
|
|||||||
From 36d001c70d8a0144ac1d038f6876c484849a74de Mon Sep 17 00:00:00 2001
|
|
||||||
From: H. Peter Anvin <hpa@linux.intel.com>
|
|
||||||
Date: Tue, 14 Sep 2010 12:42:41 -0700
|
|
||||||
Subject: x86-64, compat: Test %rax for the syscall number, not %eax
|
|
||||||
|
|
||||||
From: H. Peter Anvin <hpa@linux.intel.com>
|
|
||||||
|
|
||||||
commit 36d001c70d8a0144ac1d038f6876c484849a74de upstream.
|
|
||||||
|
|
||||||
On 64 bits, we always, by necessity, jump through the system call
|
|
||||||
table via %rax. For 32-bit system calls, in theory the system call
|
|
||||||
number is stored in %eax, and the code was testing %eax for a valid
|
|
||||||
system call number. At one point we loaded the stored value back from
|
|
||||||
the stack to enforce zero-extension, but that was removed in checkin
|
|
||||||
d4d67150165df8bf1cc05e532f6efca96f907cab. An actual 32-bit process
|
|
||||||
will not be able to introduce a non-zero-extended number, but it can
|
|
||||||
happen via ptrace.
|
|
||||||
|
|
||||||
Instead of re-introducing the zero-extension, test what we are
|
|
||||||
actually going to use, i.e. %rax. This only adds a handful of REX
|
|
||||||
prefixes to the code.
|
|
||||||
|
|
||||||
Reported-by: Ben Hawkes <hawkes@sota.gen.nz>
|
|
||||||
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
|
|
||||||
Cc: Roland McGrath <roland@redhat.com>
|
|
||||||
Cc: Andrew Morton <akpm@linux-foundation.org>
|
|
||||||
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
|
||||||
|
|
||||||
---
|
|
||||||
arch/x86/ia32/ia32entry.S | 14 +++++++-------
|
|
||||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
--- a/arch/x86/ia32/ia32entry.S
|
|
||||||
+++ b/arch/x86/ia32/ia32entry.S
|
|
||||||
@@ -153,7 +153,7 @@ ENTRY(ia32_sysenter_target)
|
|
||||||
testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
|
|
||||||
CFI_REMEMBER_STATE
|
|
||||||
jnz sysenter_tracesys
|
|
||||||
- cmpl $(IA32_NR_syscalls-1),%eax
|
|
||||||
+ cmpq $(IA32_NR_syscalls-1),%rax
|
|
||||||
ja ia32_badsys
|
|
||||||
sysenter_do_call:
|
|
||||||
IA32_ARG_FIXUP
|
|
||||||
@@ -195,7 +195,7 @@ sysexit_from_sys_call:
|
|
||||||
movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */
|
|
||||||
call audit_syscall_entry
|
|
||||||
movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
|
|
||||||
- cmpl $(IA32_NR_syscalls-1),%eax
|
|
||||||
+ cmpq $(IA32_NR_syscalls-1),%rax
|
|
||||||
ja ia32_badsys
|
|
||||||
movl %ebx,%edi /* reload 1st syscall arg */
|
|
||||||
movl RCX-ARGOFFSET(%rsp),%esi /* reload 2nd syscall arg */
|
|
||||||
@@ -248,7 +248,7 @@ sysenter_tracesys:
|
|
||||||
call syscall_trace_enter
|
|
||||||
LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
|
|
||||||
RESTORE_REST
|
|
||||||
- cmpl $(IA32_NR_syscalls-1),%eax
|
|
||||||
+ cmpq $(IA32_NR_syscalls-1),%rax
|
|
||||||
ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
|
|
||||||
jmp sysenter_do_call
|
|
||||||
CFI_ENDPROC
|
|
||||||
@@ -314,7 +314,7 @@ ENTRY(ia32_cstar_target)
|
|
||||||
testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
|
|
||||||
CFI_REMEMBER_STATE
|
|
||||||
jnz cstar_tracesys
|
|
||||||
- cmpl $IA32_NR_syscalls-1,%eax
|
|
||||||
+ cmpq $IA32_NR_syscalls-1,%rax
|
|
||||||
ja ia32_badsys
|
|
||||||
cstar_do_call:
|
|
||||||
IA32_ARG_FIXUP 1
|
|
||||||
@@ -367,7 +367,7 @@ cstar_tracesys:
|
|
||||||
LOAD_ARGS32 ARGOFFSET, 1 /* reload args from stack in case ptrace changed it */
|
|
||||||
RESTORE_REST
|
|
||||||
xchgl %ebp,%r9d
|
|
||||||
- cmpl $(IA32_NR_syscalls-1),%eax
|
|
||||||
+ cmpq $(IA32_NR_syscalls-1),%rax
|
|
||||||
ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
|
|
||||||
jmp cstar_do_call
|
|
||||||
END(ia32_cstar_target)
|
|
||||||
@@ -425,7 +425,7 @@ ENTRY(ia32_syscall)
|
|
||||||
orl $TS_COMPAT,TI_status(%r10)
|
|
||||||
testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
|
|
||||||
jnz ia32_tracesys
|
|
||||||
- cmpl $(IA32_NR_syscalls-1),%eax
|
|
||||||
+ cmpq $(IA32_NR_syscalls-1),%rax
|
|
||||||
ja ia32_badsys
|
|
||||||
ia32_do_call:
|
|
||||||
IA32_ARG_FIXUP
|
|
||||||
@@ -444,7 +444,7 @@ ia32_tracesys:
|
|
||||||
call syscall_trace_enter
|
|
||||||
LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
|
|
||||||
RESTORE_REST
|
|
||||||
- cmpl $(IA32_NR_syscalls-1),%eax
|
|
||||||
+ cmpq $(IA32_NR_syscalls-1),%rax
|
|
||||||
ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
|
|
||||||
jmp ia32_do_call
|
|
||||||
END(ia32_syscall)
|
|
||||||
@ -1,122 +0,0 @@
|
|||||||
--- linux-2.6.34-sabayon.orig/arch/ia64/include/asm/compat.h 2010-05-16 23:17:36.000000000 +0200
|
|
||||||
+++ linux-2.6.34-sabayon/arch/ia64/include/asm/compat.h 2010-09-18 17:09:30.728304722 +0200
|
|
||||||
@@ -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);
|
|
||||||
--- linux-2.6.34-sabayon.orig/arch/mips/include/asm/compat.h 2010-05-16 23:17:36.000000000 +0200
|
|
||||||
+++ linux-2.6.34-sabayon/arch/mips/include/asm/compat.h 2010-09-18 17:09:30.728822831 +0200
|
|
||||||
@@ -145,7 +145,7 @@ static inline compat_uptr_t ptr_to_compa
|
|
||||||
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;
|
|
||||||
--- linux-2.6.34-sabayon.orig/arch/parisc/include/asm/compat.h 2010-05-16 23:17:36.000000000 +0200
|
|
||||||
+++ linux-2.6.34-sabayon/arch/parisc/include/asm/compat.h 2010-09-18 17:09:30.728822831 +0200
|
|
||||||
@@ -147,7 +147,7 @@ static inline compat_uptr_t ptr_to_compa
|
|
||||||
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];
|
|
||||||
--- linux-2.6.34-sabayon.orig/arch/powerpc/include/asm/compat.h 2010-05-16 23:17:36.000000000 +0200
|
|
||||||
+++ linux-2.6.34-sabayon/arch/powerpc/include/asm/compat.h 2010-09-18 17:09:30.728822831 +0200
|
|
||||||
@@ -134,7 +134,7 @@ static inline compat_uptr_t ptr_to_compa
|
|
||||||
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];
|
|
||||||
--- linux-2.6.34-sabayon.orig/arch/s390/include/asm/compat.h 2010-05-16 23:17:36.000000000 +0200
|
|
||||||
+++ linux-2.6.34-sabayon/arch/s390/include/asm/compat.h 2010-09-18 17:09:30.728822831 +0200
|
|
||||||
@@ -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;
|
|
||||||
|
|
||||||
--- linux-2.6.34-sabayon.orig/arch/sparc/include/asm/compat.h 2010-05-16 23:17:36.000000000 +0200
|
|
||||||
+++ linux-2.6.34-sabayon/arch/sparc/include/asm/compat.h 2010-09-18 17:09:30.729822459 +0200
|
|
||||||
@@ -167,7 +167,7 @@ static inline compat_uptr_t ptr_to_compa
|
|
||||||
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];
|
|
||||||
--- linux-2.6.34-sabayon.orig/arch/x86/include/asm/compat.h 2010-05-16 23:17:36.000000000 +0200
|
|
||||||
+++ linux-2.6.34-sabayon/arch/x86/include/asm/compat.h 2010-09-18 17:09:30.729822459 +0200
|
|
||||||
@@ -205,7 +205,7 @@ static inline compat_uptr_t ptr_to_compa
|
|
||||||
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;
|
|
||||||
--- linux-2.6.34-sabayon.orig/include/linux/compat.h 2010-05-16 23:17:36.000000000 +0200
|
|
||||||
+++ linux-2.6.34-sabayon/include/linux/compat.h 2010-09-18 17:09:30.729822459 +0200
|
|
||||||
@@ -356,5 +356,7 @@ asmlinkage long compat_sys_newfstatat(un
|
|
||||||
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 */
|
|
||||||
--- linux-2.6.34-sabayon.orig/kernel/compat.c 2010-05-16 23:17:36.000000000 +0200
|
|
||||||
+++ linux-2.6.34-sabayon/kernel/compat.c 2010-09-18 17:09:58.574836565 +0200
|
|
||||||
@@ -25,6 +25,7 @@
|
|
||||||
#include <linux/posix-timers.h>
|
|
||||||
#include <linux/times.h>
|
|
||||||
#include <linux/ptrace.h>
|
|
||||||
+#include <linux/module.h>
|
|
||||||
#include <linux/gfp.h>
|
|
||||||
|
|
||||||
#include <asm/uaccess.h>
|
|
||||||
@@ -1140,3 +1141,24 @@ compat_sys_sysinfo(struct compat_sysinfo
|
|
||||||
|
|
||||||
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);
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
From eefdca043e8391dcd719711716492063030b55ac Mon Sep 17 00:00:00 2001
|
|
||||||
From: Roland McGrath <roland@redhat.com>
|
|
||||||
Date: Tue, 14 Sep 2010 12:22:58 -0700
|
|
||||||
Subject: x86-64, compat: Retruncate rax after ia32 syscall entry tracing
|
|
||||||
|
|
||||||
From: Roland McGrath <roland@redhat.com>
|
|
||||||
|
|
||||||
commit eefdca043e8391dcd719711716492063030b55ac upstream.
|
|
||||||
|
|
||||||
In commit d4d6715, we reopened an old hole for a 64-bit ptracer touching a
|
|
||||||
32-bit tracee in system call entry. A %rax value set via ptrace at the
|
|
||||||
entry tracing stop gets used whole as a 32-bit syscall number, while we
|
|
||||||
only check the low 32 bits for validity.
|
|
||||||
|
|
||||||
Fix it by truncating %rax back to 32 bits after syscall_trace_enter,
|
|
||||||
in addition to testing the full 64 bits as has already been added.
|
|
||||||
|
|
||||||
Reported-by: Ben Hawkes <hawkes@sota.gen.nz>
|
|
||||||
Signed-off-by: Roland McGrath <roland@redhat.com>
|
|
||||||
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
|
|
||||||
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
|
||||||
|
|
||||||
---
|
|
||||||
arch/x86/ia32/ia32entry.S | 8 +++++++-
|
|
||||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/arch/x86/ia32/ia32entry.S
|
|
||||||
+++ b/arch/x86/ia32/ia32entry.S
|
|
||||||
@@ -50,7 +50,12 @@
|
|
||||||
/*
|
|
||||||
* Reload arg registers from stack in case ptrace changed them.
|
|
||||||
* We don't reload %eax because syscall_trace_enter() returned
|
|
||||||
- * the value it wants us to use in the table lookup.
|
|
||||||
+ * the %rax value we should see. Instead, we just truncate that
|
|
||||||
+ * value to 32 bits again as we did on entry from user mode.
|
|
||||||
+ * If it's a new value set by user_regset during entry tracing,
|
|
||||||
+ * this matches the normal truncation of the user-mode value.
|
|
||||||
+ * If it's -1 to make us punt the syscall, then (u32)-1 is still
|
|
||||||
+ * an appropriately invalid value.
|
|
||||||
*/
|
|
||||||
.macro LOAD_ARGS32 offset, _r9=0
|
|
||||||
.if \_r9
|
|
||||||
@@ -60,6 +65,7 @@
|
|
||||||
movl \offset+48(%rsp),%edx
|
|
||||||
movl \offset+56(%rsp),%esi
|
|
||||||
movl \offset+64(%rsp),%edi
|
|
||||||
+ movl %eax,%eax /* zero extension */
|
|
||||||
.endm
|
|
||||||
|
|
||||||
.macro CFI_STARTPROC32 simple
|
|
||||||
@ -1,97 +0,0 @@
|
|||||||
From 36d001c70d8a0144ac1d038f6876c484849a74de Mon Sep 17 00:00:00 2001
|
|
||||||
From: H. Peter Anvin <hpa@linux.intel.com>
|
|
||||||
Date: Tue, 14 Sep 2010 12:42:41 -0700
|
|
||||||
Subject: x86-64, compat: Test %rax for the syscall number, not %eax
|
|
||||||
|
|
||||||
From: H. Peter Anvin <hpa@linux.intel.com>
|
|
||||||
|
|
||||||
commit 36d001c70d8a0144ac1d038f6876c484849a74de upstream.
|
|
||||||
|
|
||||||
On 64 bits, we always, by necessity, jump through the system call
|
|
||||||
table via %rax. For 32-bit system calls, in theory the system call
|
|
||||||
number is stored in %eax, and the code was testing %eax for a valid
|
|
||||||
system call number. At one point we loaded the stored value back from
|
|
||||||
the stack to enforce zero-extension, but that was removed in checkin
|
|
||||||
d4d67150165df8bf1cc05e532f6efca96f907cab. An actual 32-bit process
|
|
||||||
will not be able to introduce a non-zero-extended number, but it can
|
|
||||||
happen via ptrace.
|
|
||||||
|
|
||||||
Instead of re-introducing the zero-extension, test what we are
|
|
||||||
actually going to use, i.e. %rax. This only adds a handful of REX
|
|
||||||
prefixes to the code.
|
|
||||||
|
|
||||||
Reported-by: Ben Hawkes <hawkes@sota.gen.nz>
|
|
||||||
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
|
|
||||||
Cc: Roland McGrath <roland@redhat.com>
|
|
||||||
Cc: Andrew Morton <akpm@linux-foundation.org>
|
|
||||||
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
|
||||||
|
|
||||||
---
|
|
||||||
arch/x86/ia32/ia32entry.S | 14 +++++++-------
|
|
||||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
--- a/arch/x86/ia32/ia32entry.S
|
|
||||||
+++ b/arch/x86/ia32/ia32entry.S
|
|
||||||
@@ -153,7 +153,7 @@ ENTRY(ia32_sysenter_target)
|
|
||||||
testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
|
|
||||||
CFI_REMEMBER_STATE
|
|
||||||
jnz sysenter_tracesys
|
|
||||||
- cmpl $(IA32_NR_syscalls-1),%eax
|
|
||||||
+ cmpq $(IA32_NR_syscalls-1),%rax
|
|
||||||
ja ia32_badsys
|
|
||||||
sysenter_do_call:
|
|
||||||
IA32_ARG_FIXUP
|
|
||||||
@@ -195,7 +195,7 @@ sysexit_from_sys_call:
|
|
||||||
movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */
|
|
||||||
call audit_syscall_entry
|
|
||||||
movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
|
|
||||||
- cmpl $(IA32_NR_syscalls-1),%eax
|
|
||||||
+ cmpq $(IA32_NR_syscalls-1),%rax
|
|
||||||
ja ia32_badsys
|
|
||||||
movl %ebx,%edi /* reload 1st syscall arg */
|
|
||||||
movl RCX-ARGOFFSET(%rsp),%esi /* reload 2nd syscall arg */
|
|
||||||
@@ -248,7 +248,7 @@ sysenter_tracesys:
|
|
||||||
call syscall_trace_enter
|
|
||||||
LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
|
|
||||||
RESTORE_REST
|
|
||||||
- cmpl $(IA32_NR_syscalls-1),%eax
|
|
||||||
+ cmpq $(IA32_NR_syscalls-1),%rax
|
|
||||||
ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
|
|
||||||
jmp sysenter_do_call
|
|
||||||
CFI_ENDPROC
|
|
||||||
@@ -314,7 +314,7 @@ ENTRY(ia32_cstar_target)
|
|
||||||
testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
|
|
||||||
CFI_REMEMBER_STATE
|
|
||||||
jnz cstar_tracesys
|
|
||||||
- cmpl $IA32_NR_syscalls-1,%eax
|
|
||||||
+ cmpq $IA32_NR_syscalls-1,%rax
|
|
||||||
ja ia32_badsys
|
|
||||||
cstar_do_call:
|
|
||||||
IA32_ARG_FIXUP 1
|
|
||||||
@@ -367,7 +367,7 @@ cstar_tracesys:
|
|
||||||
LOAD_ARGS32 ARGOFFSET, 1 /* reload args from stack in case ptrace changed it */
|
|
||||||
RESTORE_REST
|
|
||||||
xchgl %ebp,%r9d
|
|
||||||
- cmpl $(IA32_NR_syscalls-1),%eax
|
|
||||||
+ cmpq $(IA32_NR_syscalls-1),%rax
|
|
||||||
ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
|
|
||||||
jmp cstar_do_call
|
|
||||||
END(ia32_cstar_target)
|
|
||||||
@@ -425,7 +425,7 @@ ENTRY(ia32_syscall)
|
|
||||||
orl $TS_COMPAT,TI_status(%r10)
|
|
||||||
testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
|
|
||||||
jnz ia32_tracesys
|
|
||||||
- cmpl $(IA32_NR_syscalls-1),%eax
|
|
||||||
+ cmpq $(IA32_NR_syscalls-1),%rax
|
|
||||||
ja ia32_badsys
|
|
||||||
ia32_do_call:
|
|
||||||
IA32_ARG_FIXUP
|
|
||||||
@@ -444,7 +444,7 @@ ia32_tracesys:
|
|
||||||
call syscall_trace_enter
|
|
||||||
LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
|
|
||||||
RESTORE_REST
|
|
||||||
- cmpl $(IA32_NR_syscalls-1),%eax
|
|
||||||
+ cmpq $(IA32_NR_syscalls-1),%rax
|
|
||||||
ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
|
|
||||||
jmp ia32_do_call
|
|
||||||
END(ia32_syscall)
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,52 +0,0 @@
|
|||||||
# Copyright 2004-2010 Sabayon Linux
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
ETYPE="sources"
|
|
||||||
K_WANT_GENPATCHES=""
|
|
||||||
K_GENPATCHES_VER=""
|
|
||||||
K_SABPATCHES_VER="6"
|
|
||||||
K_SABKERNEL_NAME="server"
|
|
||||||
K_ONLY_SOURCES="1"
|
|
||||||
# Security patches for CVE-2010-3081, will be merged in next stable kernel release
|
|
||||||
K_KERNEL_PATCH_HOTFIXES="${FILESDIR}/hotfixes/2.6.33/x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch
|
|
||||||
${FILESDIR}/hotfixes/2.6.33/x86-64-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch
|
|
||||||
${FILESDIR}/hotfixes/2.6.33/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch"
|
|
||||||
inherit sabayon-kernel
|
|
||||||
KEYWORDS="~amd64 ~x86"
|
|
||||||
DESCRIPTION="Official Sabayon Linux Server kernel sources"
|
|
||||||
RESTRICT="mirror"
|
|
||||||
IUSE="sources_standalone"
|
|
||||||
|
|
||||||
DEPEND="${DEPEND}
|
|
||||||
sources_standalone? ( !=sys-kernel/linux-server-${PVR} )
|
|
||||||
!sources_standalone? ( =sys-kernel/linux-server-${PVR} )"
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
kernel-2_src_compile
|
|
||||||
}
|
|
||||||
|
|
||||||
### override sabayon-kernel-src_install()
|
|
||||||
src_install() {
|
|
||||||
|
|
||||||
local version_h_name="usr/src/linux-${KV_FULL}/include/linux"
|
|
||||||
local version_h="${ROOT}${version_h_name}"
|
|
||||||
if [ -f "${version_h}" ]; then
|
|
||||||
einfo "Discarding previously installed version.h to avoid collisions"
|
|
||||||
addwrite "/${version_h_name}"
|
|
||||||
rm -f "${version_h}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
kernel-2_src_install
|
|
||||||
cd "${D}/usr/src/linux-${KV_FULL}"
|
|
||||||
local oldarch=${ARCH}
|
|
||||||
cp "${FILESDIR}/${P}-${ARCH}.config" .config || die "cannot copy kernel config"
|
|
||||||
unset ARCH
|
|
||||||
if ! use sources_standalone; then
|
|
||||||
make modules_prepare || die "failed to run modules_prepare"
|
|
||||||
rm .config || die "cannot remove .config"
|
|
||||||
rm Makefile || die "cannot remove Makefile"
|
|
||||||
rm include/linux/version.h || die "cannot remove include/linux/version.h"
|
|
||||||
fi
|
|
||||||
ARCH=${oldarch}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
# Copyright 2004-2010 Sabayon Linux
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
ETYPE="sources"
|
|
||||||
K_WANT_GENPATCHES=""
|
|
||||||
K_GENPATCHES_VER=""
|
|
||||||
K_SABPATCHES_VER="11"
|
|
||||||
K_KERNEL_PATCH_VER="6"
|
|
||||||
K_SABKERNEL_NAME="server"
|
|
||||||
K_SABKERNEL_URI_CONFIG="yes"
|
|
||||||
K_ONLY_SOURCES="1"
|
|
||||||
# Security patches for CVE-2010-3081, will be merged in next stable kernel release
|
|
||||||
K_KERNEL_PATCH_HOTFIXES="${FILESDIR}/hotfixes/2.6.34/x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch
|
|
||||||
${FILESDIR}/hotfixes/2.6.34/x86-64-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch
|
|
||||||
${FILESDIR}/hotfixes/2.6.34/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch"
|
|
||||||
inherit sabayon-kernel
|
|
||||||
KEYWORDS="~amd64 ~x86"
|
|
||||||
DESCRIPTION="Official Sabayon Linux Server kernel sources"
|
|
||||||
RESTRICT="mirror"
|
|
||||||
IUSE="sources_standalone"
|
|
||||||
|
|
||||||
DEPEND="${DEPEND}
|
|
||||||
sources_standalone? ( !=sys-kernel/linux-server-${PVR} )
|
|
||||||
!sources_standalone? ( =sys-kernel/linux-server-${PVR} )"
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
# Copyright 2004-2010 Sabayon Linux
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
ETYPE="sources"
|
|
||||||
K_WANT_GENPATCHES=""
|
|
||||||
K_GENPATCHES_VER=""
|
|
||||||
K_SABPATCHES_VER="9"
|
|
||||||
K_KERNEL_PATCH_VER="3"
|
|
||||||
K_SABKERNEL_NAME="server"
|
|
||||||
K_SABKERNEL_URI_CONFIG="yes"
|
|
||||||
K_ONLY_SOURCES="1"
|
|
||||||
# Security patches for CVE-2010-3081, will be merged in next stable kernel release
|
|
||||||
K_KERNEL_PATCH_HOTFIXES="${FILESDIR}/hotfixes/2.6.35/linux-2.6.git-c41d68a513c71e35a14f66d71782d27a79a81ea6.patch
|
|
||||||
${FILESDIR}/hotfixes/2.6.35/linux-2.6.git-eefdca043e8391dcd719711716492063030b55ac.patch
|
|
||||||
${FILESDIR}/hotfixes/2.6.35/linux-2.6.git-36d001c70d8a0144ac1d038f6876c484849a74de.patch"
|
|
||||||
inherit sabayon-kernel
|
|
||||||
KEYWORDS="~amd64 ~x86"
|
|
||||||
DESCRIPTION="Official Sabayon Linux Server kernel sources"
|
|
||||||
RESTRICT="mirror"
|
|
||||||
IUSE="sources_standalone"
|
|
||||||
|
|
||||||
DEPEND="${DEPEND}
|
|
||||||
sources_standalone? ( !=sys-kernel/linux-server-${PVR} )
|
|
||||||
!sources_standalone? ( =sys-kernel/linux-server-${PVR} )"
|
|
||||||
@ -2,16 +2,16 @@
|
|||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
ETYPE="sources"
|
ETYPE="sources"
|
||||||
K_WANT_GENPATCHES=""
|
K_WANT_GENPATCHES="base extras"
|
||||||
K_GENPATCHES_VER=""
|
K_GENPATCHES_VER="7"
|
||||||
K_SABPATCHES_VER="9"
|
K_NASPATCHES_VER="1"
|
||||||
K_KERNEL_PATCH_VER="5"
|
K_KERNEL_PATCH_VER="5"
|
||||||
K_SABKERNEL_NAME="server"
|
K_NASKERNEL_NAME="server"
|
||||||
K_SABKERNEL_URI_CONFIG="yes"
|
K_NASKERNEL_URI_CONFIG="yes"
|
||||||
K_ONLY_SOURCES="1"
|
K_ONLY_SOURCES="1"
|
||||||
inherit sabayon-kernel
|
inherit nas-kernel
|
||||||
KEYWORDS="~amd64 ~x86"
|
KEYWORDS="~arm"
|
||||||
DESCRIPTION="Official Sabayon Linux Server kernel sources"
|
DESCRIPTION="Official NAS Linux Server kernel sources"
|
||||||
RESTRICT="mirror"
|
RESTRICT="mirror"
|
||||||
IUSE="sources_standalone"
|
IUSE="sources_standalone"
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user