Browse Source

kprobes/x86-64: Fix to move common_interrupt to .kprobes.text

Since nmi, debug and int3 returns to irq_return inside common_interrupt,
probing this function will cause int3-loop, so it should be marked
as __kprobes.

Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
Acked-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
LKML-Reference: <20090827172325.8246.40000.stgit@localhost.localdomain>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Masami Hiramatsu 15 năm trước cách đây
mục cha
commit
8222d718b3
1 tập tin đã thay đổi với 8 bổ sung0 xóa
  1. 8 0
      arch/x86/kernel/entry_64.S

+ 8 - 0
arch/x86/kernel/entry_64.S

@@ -809,6 +809,10 @@ END(interrupt)
 	call \func
 	call \func
 	.endm
 	.endm
 
 
+/*
+ * Interrupt entry/exit should be protected against kprobes
+ */
+	.pushsection .kprobes.text, "ax"
 	/*
 	/*
 	 * The interrupt stubs push (~vector+0x80) onto the stack and
 	 * The interrupt stubs push (~vector+0x80) onto the stack and
 	 * then jump to common_interrupt.
 	 * then jump to common_interrupt.
@@ -947,6 +951,10 @@ ENTRY(retint_kernel)
 
 
 	CFI_ENDPROC
 	CFI_ENDPROC
 END(common_interrupt)
 END(common_interrupt)
+/*
+ * End of kprobes section
+ */
+       .popsection
 
 
 /*
 /*
  * APIC interrupts.
  * APIC interrupts.