diff options
| author | Fernando Luis Vázquez Cao <fernando@oss.ntt.co.jp> | 2006-09-26 10:52:36 +0200 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-09-26 10:52:36 +0200 |
| commit | 6f6b1e0477ccb2f25a9b045e38440347d2ce21c8 (patch) | |
| tree | 691c53a8a7e1e6338d11bd3158618cbc44036a57 /arch/i386 | |
| parent | e9dff0ee6694b2edd40b1b448cb786f6a7b02336 (diff) | |
| download | kernel_samsung_smdk4412-6f6b1e0477ccb2f25a9b045e38440347d2ce21c8.zip kernel_samsung_smdk4412-6f6b1e0477ccb2f25a9b045e38440347d2ce21c8.tar.gz kernel_samsung_smdk4412-6f6b1e0477ccb2f25a9b045e38440347d2ce21c8.tar.bz2 | |
[PATCH] i386: Disallow kprobes on NMI handlers
A kprobe executes IRET early and that could cause NMI recursion and stack
corruption.
Note: This problem was originally spotted by Andi Kleen. This patch
adds fixes not included in his original patch.
[AK: Jan Beulich originally discovered these classes of bugs]
Signed-off-by: Fernando Vazquez <fernando@intellilink.co.jp>
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/kernel/mca.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/i386/kernel/mca.c b/arch/i386/kernel/mca.c index cd5456f..eb57a85 100644 --- a/arch/i386/kernel/mca.c +++ b/arch/i386/kernel/mca.c @@ -42,6 +42,7 @@ #include <linux/errno.h> #include <linux/kernel.h> #include <linux/mca.h> +#include <linux/kprobes.h> #include <asm/system.h> #include <asm/io.h> #include <linux/proc_fs.h> @@ -414,7 +415,8 @@ subsys_initcall(mca_init); /*--------------------------------------------------------------------*/ -static void mca_handle_nmi_device(struct mca_device *mca_dev, int check_flag) +static __kprobes void +mca_handle_nmi_device(struct mca_device *mca_dev, int check_flag) { int slot = mca_dev->slot; @@ -444,7 +446,7 @@ static void mca_handle_nmi_device(struct mca_device *mca_dev, int check_flag) /*--------------------------------------------------------------------*/ -static int mca_handle_nmi_callback(struct device *dev, void *data) +static int __kprobes mca_handle_nmi_callback(struct device *dev, void *data) { struct mca_device *mca_dev = to_mca_device(dev); unsigned char pos5; @@ -462,7 +464,7 @@ static int mca_handle_nmi_callback(struct device *dev, void *data) return 0; } -void mca_handle_nmi(void) +void __kprobes mca_handle_nmi(void) { /* First try - scan the various adapters and see if a specific * adapter was responsible for the error. |