From owner-svn-src-head@freebsd.org Wed Feb 15 01:35:27 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AD01CCDF84E; Wed, 15 Feb 2017 01:35:27 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 799B9238; Wed, 15 Feb 2017 01:35:27 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1F1ZQbt059612; Wed, 15 Feb 2017 01:35:26 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1F1ZQjf059611; Wed, 15 Feb 2017 01:35:26 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201702150135.v1F1ZQjf059611@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Wed, 15 Feb 2017 01:35:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r313755 - head/sys/cddl/contrib/opensolaris/uts/common/dtrace X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2017 01:35:27 -0000 Author: markj Date: Wed Feb 15 01:35:26 2017 New Revision: 313755 URL: https://svnweb.freebsd.org/changeset/base/313755 Log: Check for an exiting process when enabling PID provider probes. MFC after: 1 week Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c Wed Feb 15 00:16:52 2017 (r313754) +++ head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c Wed Feb 15 01:35:26 2017 (r313755) @@ -1248,6 +1248,13 @@ fasttrap_pid_enable(void *arg, dtrace_id #else if ((p = pfind(probe->ftp_pid)) == NULL) return; + if ((p->p_flag & P_WEXIT) != 0) { + PROC_UNLOCK(p); + return; + } + + _PHOLD(p); + PROC_UNLOCK(p); #endif /* @@ -1255,13 +1262,6 @@ fasttrap_pid_enable(void *arg, dtrace_id * the chance to execute the trap instruction we're about to place * in their process's text. */ -#ifdef __FreeBSD__ - /* - * pfind() returns a locked process. - */ - _PHOLD(p); - PROC_UNLOCK(p); -#endif fasttrap_enable_callbacks(); /*