Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

kprobes/x86: Do not jump-optimize kprobes on irq entry code

Since the kernel segment registers are not prepared at the
entry of irq-entry code, if a kprobe on such code is
jump-optimized, accessing per-CPU variables may cause a
kernel panic.

However, if the kprobe is not optimized, it triggers an int3
exception and sets segment registers correctly.

With this patch we check the probe-address and if it is in the
irq-entry code, it prohibits optimizing such kprobes.

This means we can continue probing such interrupt handlers by kprobes
but it is not optimized anymore.

Reported-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Tested-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: David S . Miller <davem@davemloft.net>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: linux-arch@vger.kernel.org
Cc: linux-cris-kernel@axis.com
Cc: mathieu.desnoyers@efficios.com
Link: http://lkml.kernel.org/r/150172795654.27216.9824039077047777477.stgit@devbox
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Masami Hiramatsu and committed by
Ingo Molnar
d9f5f32a 229a7186

+6 -3
+6 -3
arch/x86/kernel/kprobes/opt.c
··· 39 39 #include <asm/insn.h> 40 40 #include <asm/debugreg.h> 41 41 #include <asm/set_memory.h> 42 + #include <asm/sections.h> 42 43 43 44 #include "common.h" 44 45 ··· 252 251 253 252 /* 254 253 * Do not optimize in the entry code due to the unstable 255 - * stack handling. 254 + * stack handling and registers setup. 256 255 */ 257 - if ((paddr >= (unsigned long)__entry_text_start) && 258 - (paddr < (unsigned long)__entry_text_end)) 256 + if (((paddr >= (unsigned long)__entry_text_start) && 257 + (paddr < (unsigned long)__entry_text_end)) || 258 + ((paddr >= (unsigned long)__irqentry_text_start) && 259 + (paddr < (unsigned long)__irqentry_text_end))) 259 260 return 0; 260 261 261 262 /* Check there is enough space for a relative jump. */