Page MenuHomeFreeBSD
Files F145260786

D13725.id37372.diff
No OneTemporary
Actions

D13725.id37372.diff
View Options

Index: head/sys/amd64/amd64/trap.c
===================================================================
--- head/sys/amd64/amd64/trap.c
+++ head/sys/amd64/amd64/trap.c
@@ -608,7 +608,6 @@
td = curthread;
p = td->td_proc;
eva = frame->tf_addr;
- rv = 0;
if (__predict_false((td->td_pflags & TDP_NOFAULTING) != 0)) {
/*
@@ -660,7 +659,7 @@
* Don't allow user-mode faults in kernel address space.
*/
if (usermode)
- goto nogo;
+ return (SIGSEGV);
map = kernel_map;
} else {
@@ -715,7 +714,6 @@
#endif
return (0);
}
-nogo:
if (!usermode) {
if (td->td_intr_nesting_level == 0 &&
curpcb->pcb_onfault != NULL) {
Index: head/sys/i386/i386/trap.c
===================================================================
--- head/sys/i386/i386/trap.c
+++ head/sys/i386/i386/trap.c
@@ -744,7 +744,6 @@
td = curthread;
p = td->td_proc;
- rv = 0;
if (__predict_false((td->td_pflags & TDP_NOFAULTING) != 0)) {
/*
@@ -805,7 +804,7 @@
return (-2);
#endif
if (usermode)
- goto nogo;
+ return (SIGSEGV);
map = kernel_map;
} else {
@@ -862,7 +861,6 @@
#endif
return (0);
}
-nogo:
if (!usermode) {
if (td->td_intr_nesting_level == 0 &&
curpcb->pcb_onfault != NULL) {

File Metadata

Mime Type
text/plain
Expires
Wed, Feb 18, 5:35 PM (6 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28852125
Default Alt Text
D13725.id37372.diff (1 KB)

Event Timeline