/[linux-patches]/genpatches-2.6/trunk/2.6.14/1465_15.6_die_if_kernel-can-return.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.14/1465_15.6_die_if_kernel-can-return.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 328 - (show annotations) (download) (as text)
Tue Mar 14 13:34:17 2006 UTC (14 years, 7 months ago) by johnm
File MIME type: text/x-diff
File size: 1053 byte(s)
2.6.14-11, rebase against local tree
1 From nobody Mon Sep 17 00:00:00 2001
2 From: Tony Luck <tony.luck@intel.com>
3 Date: Mon Feb 27 16:18:58 2006 -0800
4 Subject: [PATCH] [IA64] die_if_kernel() can return (CVE-2006-0742)
5
6 arch/ia64/kernel/unaligned.c erroneously marked die_if_kernel()
7 with a "noreturn" attribute ... which is silly (it returns whenever
8 the argument regs say that the fault happened in user mode, as one
9 might expect given the "if_kernel" part of its name!). Thanks to
10 Alan and Gareth for pointing this out.
11
12 Signed-off-by: Tony Luck <tony.luck@intel.com>
13 Signed-off-by: Chris Wright <chrisw@sous-sol.org>
14 ---
15
16 arch/ia64/kernel/unaligned.c | 2 +-
17 1 files changed, 1 insertion(+), 1 deletion(-)
18
19 --- linux-2.6.15.5.orig/arch/ia64/kernel/unaligned.c
20 +++ linux-2.6.15.5/arch/ia64/kernel/unaligned.c
21 @@ -24,7 +24,7 @@
22 #include <asm/uaccess.h>
23 #include <asm/unaligned.h>
24
25 -extern void die_if_kernel(char *str, struct pt_regs *regs, long err) __attribute__ ((noreturn));
26 +extern void die_if_kernel(char *str, struct pt_regs *regs, long err);
27
28 #undef DEBUG_UNALIGNED_TRAP
29

  ViewVC Help
Powered by ViewVC 1.1.20