The patch titled
kprobes-x86_64 : entry.s::error_entry is not safe for kprobes
has been added to the -mm tree. Its filename is
kprobes-x86_64-entryserror_entry-is-not-safe-for-kprobes.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: kprobes-x86_64 : entry.s::error_entry is not safe for kprobes
From: "S. P. Prasanna" <prasanna@xxxxxxxxxx>
Move the entry.S:error_entry to .kprobes.text section, since code marked
unsafe for kprobes jumps directly to entry.S::error_entry, that must be
marked unsafe as Chuck Ebbert suggested.
Also move all the ".previous.text" asm directives to ".previous" for
kprobes section.
Signed-off-by: Prasanna S.P. <prasanna@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/x86_64/kernel/entry.S | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff -puN arch/x86_64/kernel/entry.S~kprobes-x86_64-entryserror_entry-is-not-safe-for-kprobes arch/x86_64/kernel/entry.S
--- a/arch/x86_64/kernel/entry.S~kprobes-x86_64-entryserror_entry-is-not-safe-for-kprobes
+++ a/arch/x86_64/kernel/entry.S
@@ -819,7 +819,7 @@ paranoid_schedule\trace:
* Exception entry point. This expects an error code/orig_rax on the stack
* and the exception handler in %rax.
*/
-ENTRY(error_entry)
+KPROBE_ENTRY(error_entry)
_frame RDI
/* rdi slot contains rax, oldrax contains error code */
cld
@@ -904,6 +904,7 @@ error_kernelspace:
je error_swapgs
jmp error_sti
END(error_entry)
+ .previous
/* Reload gs selector with exception handling */
/* edi: new selector */
@@ -1023,7 +1024,7 @@ ENDPROC(execve)
KPROBE_ENTRY(page_fault)
errorentry do_page_fault
END(page_fault)
- .previous .text
+ .previous
ENTRY(coprocessor_error)
zeroentry do_coprocessor_error
@@ -1045,7 +1046,7 @@ KPROBE_ENTRY(debug)
paranoidentry do_debug, DEBUG_STACK
paranoidexit
END(debug)
- .previous .text
+ .previous
/* runs on exception stack */
KPROBE_ENTRY(nmi)
@@ -1060,7 +1061,7 @@ KPROBE_ENTRY(nmi)
CFI_ENDPROC
#endif
END(nmi)
- .previous .text
+ .previous
KPROBE_ENTRY(int3)
INTR_FRAME
@@ -1070,7 +1071,7 @@ KPROBE_ENTRY(int3)
jmp paranoid_exit1
CFI_ENDPROC
END(int3)
- .previous .text
+ .previous
ENTRY(overflow)
zeroentry do_overflow
@@ -1119,7 +1120,7 @@ END(stack_segment)
KPROBE_ENTRY(general_protection)
errorentry do_general_protection
END(general_protection)
- .previous .text
+ .previous
ENTRY(alignment_check)
errorentry do_alignment_check
_
Patches currently in -mm which might be from prasanna@xxxxxxxxxx are
origin.patch
kprobes-x86_64-entryserror_entry-is-not-safe-for-kprobes.patch
i386-entryserror_code-is-not-safe-for-kprobes.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
