diff options
| author | Andi Kleen <ak@suse.de> | 2007-06-20 06:23:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-20 17:27:26 -0400 |
| commit | 55181000cd60334fe920c65ffbcdfe0e3f1de406 (patch) | |
| tree | 64ecf0214b425e42013b631d8acdcacfafa43048 /arch | |
| parent | 9f1f79e641c548ee93fb20f69c9a404b92ee4fdd (diff) | |
x86: Disable KPROBES with DEBUG_RODATA for now
Right now Kprobes cannot write to the write protected kernel text when
DEBUG_RODATA is enabled. Disallow this in Kconfig for now.
Temporary fix for 2.6.22. In .23 add code to temporarily
unprotect it.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/Kconfig.debug | 1 | ||||
| -rw-r--r-- | arch/x86_64/Kconfig.debug | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/i386/Kconfig.debug b/arch/i386/Kconfig.debug index b31c0802e1cc..6293920cd1be 100644 --- a/arch/i386/Kconfig.debug +++ b/arch/i386/Kconfig.debug | |||
| @@ -49,6 +49,7 @@ config DEBUG_PAGEALLOC | |||
| 49 | config DEBUG_RODATA | 49 | config DEBUG_RODATA |
| 50 | bool "Write protect kernel read-only data structures" | 50 | bool "Write protect kernel read-only data structures" |
| 51 | depends on DEBUG_KERNEL | 51 | depends on DEBUG_KERNEL |
| 52 | depends on !KPROBES # temporary for 2.6.22 | ||
| 52 | help | 53 | help |
| 53 | Mark the kernel read-only data as write-protected in the pagetables, | 54 | Mark the kernel read-only data as write-protected in the pagetables, |
| 54 | in order to catch accidental (and incorrect) writes to such const | 55 | in order to catch accidental (and incorrect) writes to such const |
diff --git a/arch/x86_64/Kconfig.debug b/arch/x86_64/Kconfig.debug index 775d211a5cf9..8a8677518447 100644 --- a/arch/x86_64/Kconfig.debug +++ b/arch/x86_64/Kconfig.debug | |||
| @@ -9,6 +9,7 @@ source "lib/Kconfig.debug" | |||
| 9 | config DEBUG_RODATA | 9 | config DEBUG_RODATA |
| 10 | bool "Write protect kernel read-only data structures" | 10 | bool "Write protect kernel read-only data structures" |
| 11 | depends on DEBUG_KERNEL | 11 | depends on DEBUG_KERNEL |
| 12 | depends on !KPROBES # temporary for 2.6.22 | ||
| 12 | help | 13 | help |
| 13 | Mark the kernel read-only data as write-protected in the pagetables, | 14 | Mark the kernel read-only data as write-protected in the pagetables, |
| 14 | in order to catch accidental (and incorrect) writes to such const data. | 15 | in order to catch accidental (and incorrect) writes to such const data. |