diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2004-02-16 14:47:20 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2004-02-16 14:47:20 +0000 |
| commit | b21a35e1610c04b8ecf41ac598ba64c42e867df3 (patch) | |
| tree | 7086d5bc014a90caf54e32f38a22df9bfd8738ec /sys-kernel/gaming-sources | |
| parent | Bump (Manifest recommit) (diff) | |
| download | gentoo-2-b21a35e1610c04b8ecf41ac598ba64c42e867df3.tar.gz gentoo-2-b21a35e1610c04b8ecf41ac598ba64c42e867df3.tar.bz2 gentoo-2-b21a35e1610c04b8ecf41ac598ba64c42e867df3.zip | |
Added the fix for the ptrace vulnerability for AMD64 platforms.
Diffstat (limited to 'sys-kernel/gaming-sources')
3 files changed, 37 insertions, 3 deletions
diff --git a/sys-kernel/gaming-sources/ChangeLog b/sys-kernel/gaming-sources/ChangeLog index 70bdc6ebef68..c9a5643b8bf6 100644 --- a/sys-kernel/gaming-sources/ChangeLog +++ b/sys-kernel/gaming-sources/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-kernel/gaming-sources -# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gaming-sources/ChangeLog,v 1.15 2004/01/21 15:53:00 plasmaroo Exp $ +# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gaming-sources/ChangeLog,v 1.16 2004/02/16 14:47:20 plasmaroo Exp $ + + 16 Feb 2004; <plasmaroo@gentoo.org> gaming-sources-2.4.20-r7.ebuild, + files/gaming-sources-2.4.20.CAN-2004-0001.patch: + Added the fix for the ptrace vulnerability for AMD64 platforms. 21 Jan 2004; <plasmaroo@gentoo.org> gaming-sources-2.4.20-r7.ebuild: Changed the CK patch to -ck7; this should solve any problems for those diff --git a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0001.patch b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0001.patch new file mode 100644 index 000000000000..bb51f9aa9a62 --- /dev/null +++ b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0001.patch @@ -0,0 +1,29 @@ +diff -u linux/arch/x86_64/ia32/ptrace32.c-PTRACE linux/arch/x86_64/ia32/ptrace32.c +--- linux/arch/x86_64/ia32/ptrace32.c-PTRACE 2003-06-16 13:03:58.000000000 +0200 ++++ linux/arch/x86_64/ia32/ptrace32.c 2004-01-07 18:04:43.000000000 +0100 +@@ -25,6 +25,10 @@ + #include <asm/fpu32.h> + #include <linux/mm.h> + ++/* determines which flags the user has access to. */ ++/* 1 = access 0 = no access */ ++#define FLAG_MASK 0x44dd5UL ++ + #define R32(l,q) \ + case offsetof(struct user32, regs.l): stack[offsetof(struct pt_regs, q)/8] = val; break + +@@ -69,9 +73,12 @@ + R32(eip, rip); + R32(esp, rsp); + +- case offsetof(struct user32, regs.eflags): +- stack[offsetof(struct pt_regs, eflags)/8] = val & 0x44dd5; ++ case offsetof(struct user32, regs.eflags): { ++ __u64 *flags = &stack[offsetof(struct pt_regs, eflags)/8]; ++ val &= FLAG_MASK; ++ *flags = val | (*flags & ~FLAG_MASK); + break; ++ } + + case offsetof(struct user32, u_debugreg[4]): + case offsetof(struct user32, u_debugreg[5]): diff --git a/sys-kernel/gaming-sources/gaming-sources-2.4.20-r7.ebuild b/sys-kernel/gaming-sources/gaming-sources-2.4.20-r7.ebuild index 8f0c70941f23..7b1b61925d76 100644 --- a/sys-kernel/gaming-sources/gaming-sources-2.4.20-r7.ebuild +++ b/sys-kernel/gaming-sources/gaming-sources-2.4.20-r7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gaming-sources/gaming-sources-2.4.20-r7.ebuild,v 1.3 2004/01/24 19:22:55 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gaming-sources/gaming-sources-2.4.20-r7.ebuild,v 1.4 2004/02/16 14:47:20 plasmaroo Exp $ IUSE="build" @@ -36,6 +36,7 @@ src_unpack() { epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch do_brk() vulnerability!" epatch ${FILESDIR}/${P}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!" + epatch ${FILESDIR}/${P}.CAN-2004-0001.patch || die "Failed to apply AMD64 ptrace patch!" epatch ${FILESDIR}/${P}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!" } |