svn commit: r322303 - in stable/10/sys: amd64/amd64 i386/i386

[Konstantin Belousov]

Author: kib
Date: Wed Aug  9 09:16:16 2017
New Revision: 322303
URL: https://svnweb.freebsd.org/changeset/base/322303

Log:
  MFC r321919:
  Do not call trapsignal() after handling usermode fault or interrupt,
  when a signal is not intended to be sent.

Modified:
  stable/10/sys/amd64/amd64/trap.c
  stable/10/sys/i386/i386/trap.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/amd64/amd64/trap.c
==============================================================================
--- stable/10/sys/amd64/amd64/trap.c    Wed Aug  9 09:13:15 2017        
(r322302)
+++ stable/10/sys/amd64/amd64/trap.c    Wed Aug  9 09:16:16 2017        
(r322303)
@@ -396,7 +396,7 @@ trap(struct trapframe *frame)
                                goto userout;
                        } else if (panic_on_nmi)
                                panic("NMI indicates hardware failure");
-                       break;
+                       goto out;
 #endif /* DEV_ISA */
 
                case T_OFLOW:           /* integer overflow fault */
@@ -434,7 +434,7 @@ trap(struct trapframe *frame)
                        if (dtrace_return_probe_ptr != NULL &&
                            dtrace_return_probe_ptr(&regs) == 0)
                                goto out;
-                       break;
+                       goto userout;
 #endif
                }
        } else {

Modified: stable/10/sys/i386/i386/trap.c
==============================================================================
--- stable/10/sys/i386/i386/trap.c      Wed Aug  9 09:13:15 2017        
(r322302)
+++ stable/10/sys/i386/i386/trap.c      Wed Aug  9 09:16:16 2017        
(r322303)
@@ -469,7 +469,7 @@ trap(struct trapframe *frame)
                                goto userout;
                        } else if (panic_on_nmi)
                                panic("NMI indicates hardware failure");
-                       break;
+                       goto out;
 #endif /* POWERFAIL_NMI */
 #endif /* DEV_ISA */
 
@@ -519,7 +519,7 @@ trap(struct trapframe *frame)
                        if (dtrace_return_probe_ptr != NULL &&
                            dtrace_return_probe_ptr(&regs) == 0)
                                goto out;
-                       break;
+                       goto userout;
 #endif
                }
        } else {
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"