989d921f5d
I'm very pleased to announce the release of our new website and documentation using the new toolchain with Hugo and AsciiDoctor. To get more information about the new toolchain please read the FreeBSD Documentation Project Primer[1], Hugo docs[2] and AsciiDoctor docs[3]. Acknowledgment: Benedict Reuschling <bcr@> Glen Barber <gjb@> Hiroki Sato <hrs@> Li-Wen Hsu <lwhsu@> Sean Chittenden <seanc@> The FreeBSD Foundation [1] https://docs.FreeBSD.org/en/books/fdp-primer/ [2] https://gohugo.io/documentation/ [3] https://docs.asciidoctor.org/home/ Approved by: doceng, core
48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
--- releng/8.1/sys/amd64/amd64/trap.c 2012/06/18 20:19:07 237240
|
|
+++ releng/8.1/sys/amd64/amd64/trap.c 2012/06/18 20:48:21 237241
|
|
@@ -972,23 +972,6 @@
|
|
ksi.ksi_code = TRAP_TRACE;
|
|
ksi.ksi_addr = (void *)frame->tf_rip;
|
|
trapsignal(td, &ksi);
|
|
-
|
|
- /*
|
|
- * If the user-supplied value of %rip is not a canonical
|
|
- * address, then some CPUs will trigger a ring 0 #GP during
|
|
- * the sysret instruction. However, the fault handler would
|
|
- * execute with the user's %gs and %rsp in ring 0 which would
|
|
- * not be safe. Instead, preemptively kill the thread with a
|
|
- * SIGBUS.
|
|
- */
|
|
- if (td->td_frame->tf_rip >= VM_MAXUSER_ADDRESS) {
|
|
- ksiginfo_init_trap(&ksi);
|
|
- ksi.ksi_signo = SIGBUS;
|
|
- ksi.ksi_code = BUS_OBJERR;
|
|
- ksi.ksi_trapno = T_PROTFLT;
|
|
- ksi.ksi_addr = (void *)td->td_frame->tf_rip;
|
|
- trapsignal(td, &ksi);
|
|
- }
|
|
}
|
|
|
|
/*
|
|
@@ -1027,4 +1010,21 @@
|
|
STOPEVENT(p, S_SCX, sa.code);
|
|
|
|
PTRACESTOP_SC(p, td, S_PT_SCX);
|
|
+
|
|
+ /*
|
|
+ * If the user-supplied value of %rip is not a canonical
|
|
+ * address, then some CPUs will trigger a ring 0 #GP during
|
|
+ * the sysret instruction. However, the fault handler would
|
|
+ * execute with the user's %gs and %rsp in ring 0 which would
|
|
+ * not be safe. Instead, preemptively kill the thread with a
|
|
+ * SIGBUS.
|
|
+ */
|
|
+ if (td->td_frame->tf_rip >= VM_MAXUSER_ADDRESS) {
|
|
+ ksiginfo_init_trap(&ksi);
|
|
+ ksi.ksi_signo = SIGBUS;
|
|
+ ksi.ksi_code = BUS_OBJERR;
|
|
+ ksi.ksi_trapno = T_PROTFLT;
|
|
+ ksi.ksi_addr = (void *)td->td_frame->tf_rip;
|
|
+ trapsignal(td, &ksi);
|
|
+ }
|
|
}
|