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.
This commit is contained in:
kamil 2019-10-13 03:50:26 +00:00
parent 130e572a10
commit 305335a1e9
1 changed files with 8 additions and 2 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_sig.c,v 1.371 2019/10/13 03:19:57 kamil Exp $ */
/* $NetBSD: kern_sig.c,v 1.372 2019/10/13 03:50:26 kamil 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.371 2019/10/13 03:19:57 kamil Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.372 2019/10/13 03:50:26 kamil Exp $");
#include "opt_ptrace.h"
#include "opt_dtrace.h"
@ -1614,6 +1614,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 */