/[linux-patches]/genpatches-2.6/trunk/2.6.14/1495_16.5_x86_64-execve-cleanup.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.14/1495_16.5_x86_64-execve-cleanup.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 381 - (show annotations) (download) (as text)
Thu Apr 13 15:29:29 2006 UTC (14 years, 6 months ago) by johnm
File MIME type: text/x-diff
File size: 1175 byte(s)
Applying appropriate CVE fixes
1 From stable-bounces@linux.kernel.org Tue Apr 11 23:19:03 2006
2 Date: Wed, 12 Apr 2006 08:18:46 +0200
3 From: Andi Kleen <ak@suse.de>
4 To: stable@kernel.org
5 Message-ID: <20060412061846.GA29499@wotan.suse.de>
6 Content-Disposition: inline
7 Cc:
8 Subject: x86_64: Clean up execve
9
10 Just call IRET always, no need for any special cases.
11
12 Needed for the next bug fix.
13
14 Signed-off-by: Andi Kleen <ak@suse.de>
15 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
16
17 ---
18 arch/x86_64/kernel/entry.S | 16 ----------------
19 1 file changed, 16 deletions(-)
20
21 --- linux-2.6.16.4.orig/arch/x86_64/kernel/entry.S
22 +++ linux-2.6.16.4/arch/x86_64/kernel/entry.S
23 @@ -408,25 +408,9 @@ ENTRY(stub_execve)
24 CFI_ADJUST_CFA_OFFSET -8
25 CFI_REGISTER rip, r11
26 SAVE_REST
27 - movq %r11, %r15
28 - CFI_REGISTER rip, r15
29 FIXUP_TOP_OF_STACK %r11
30 call sys_execve
31 - GET_THREAD_INFO(%rcx)
32 - bt $TIF_IA32,threadinfo_flags(%rcx)
33 - CFI_REMEMBER_STATE
34 - jc exec_32bit
35 RESTORE_TOP_OF_STACK %r11
36 - movq %r15, %r11
37 - CFI_REGISTER rip, r11
38 - RESTORE_REST
39 - pushq %r11
40 - CFI_ADJUST_CFA_OFFSET 8
41 - CFI_REL_OFFSET rip, 0
42 - ret
43 -
44 -exec_32bit:
45 - CFI_RESTORE_STATE
46 movq %rax,RAX(%rsp)
47 RESTORE_REST
48 jmp int_ret_from_sys_call

  ViewVC Help
Powered by ViewVC 1.1.20