Module Name: src
Committed By: martin
Date: Tue Oct 15 19:28:17 UTC 2019
Modified Files:
src/sys/kern [netbsd-9]: kern_sig.c
Log Message:
Pull up following revision(s) (requested by kamil in ticket #330):
sys/kern/kern_sig.c: revision 1.372
Avoid double lwp_exit() in eventswitch()
For the PTRACE_LWP_EXIT event, the eventswitch() call is triggered from
lwp_exit(). In the case of setting the program status to PS_WEXIT, do not
try to demise in place, by calling lwp_exit() as it causes panic.
In this scenario bail out from the function and resume the lwp_exit()
procedure.
To generate a diff of this commit:
cvs rdiff -u -r1.364.2.6 -r1.364.2.7 src/sys/kern/kern_sig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_sig.c
diff -u src/sys/kern/kern_sig.c:1.364.2.6 src/sys/kern/kern_sig.c:1.364.2.7
--- src/sys/kern/kern_sig.c:1.364.2.6 Tue Oct 15 19:27:04 2019
+++ src/sys/kern/kern_sig.c Tue Oct 15 19:28:16 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sig.c,v 1.364.2.6 2019/10/15 19:27:04 martin Exp $ */
+/* $NetBSD: kern_sig.c,v 1.364.2.7 2019/10/15 19:28:16 martin Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.364.2.6 2019/10/15 19:27:04 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.364.2.7 2019/10/15 19:28:16 martin Exp $");
#include "opt_ptrace.h"
#include "opt_dtrace.h"
@@ -1612,6 +1612,12 @@ repeat:
if (__predict_false(ISSET(p->p_sflag, PS_WEXIT))) {
mutex_exit(p->p_lock);
mutex_exit(proc_lock);
+
+ if (pe_report_event == PTRACE_LWP_EXIT) {
+ /* Avoid double lwp_exit() and panic. */
+ return;
+ }
+
lwp_exit(l);
panic("eventswitch");
/* NOTREACHED */
