Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55181000 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

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: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9f1f79e6

arch/i386/Kconfig.debug

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ config DEBUG_PAGEALLOC 
config DEBUG_RODATA

	bool "Write protect kernel read-only data structures"

	depends on DEBUG_KERNEL

	depends on !KPROBES # temporary for 2.6.22

	help

	  Mark the kernel read-only data as write-protected in the pagetables,

	  in order to catch accidental (and incorrect) writes to such const

arch/x86_64/Kconfig.debug

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ source "lib/Kconfig.debug" 
config DEBUG_RODATA

       bool "Write protect kernel read-only data structures"

       depends on DEBUG_KERNEL

       depends on !KPROBES # temporary for 2.6.22

       help

	 Mark the kernel read-only data as write-protected in the pagetables,

	 in order to catch accidental (and incorrect) writes to such const data.