From owner-svn-src-all@freebsd.org  Tue Mar  8 00:46:05 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 22566AC3F06;
 Tue,  8 Mar 2016 00:46:05 +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 E9149305;
 Tue,  8 Mar 2016 00:46:04 +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 u280k3lL042213;
 Tue, 8 Mar 2016 00:46:03 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u280k3GR042212;
 Tue, 8 Mar 2016 00:46:03 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201603080046.u280k3GR042212@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Tue, 8 Mar 2016 00:46:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r296480 - head/sys/cddl/dev/dtrace
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Mar 2016 00:46:05 -0000

Author: markj
Date: Tue Mar  8 00:46:03 2016
New Revision: 296480
URL: https://svnweb.freebsd.org/changeset/base/296480

Log:
  Fix a couple of silly mistakes in r291962.
  
  - Handle the case where no DOF helper is provided. This occurs with the
    currently-unused DTRACEHIOC_ADD ioctl.
  - Fix some checks that prevented the loading DOF in the (non-default)
    lazyload mode.

Modified:
  head/sys/cddl/dev/dtrace/dtrace_ioctl.c

Modified: head/sys/cddl/dev/dtrace/dtrace_ioctl.c
==============================================================================
--- head/sys/cddl/dev/dtrace/dtrace_ioctl.c	Tue Mar  8 00:43:03 2016	(r296479)
+++ head/sys/cddl/dev/dtrace/dtrace_ioctl.c	Tue Mar  8 00:46:03 2016	(r296480)
@@ -47,14 +47,14 @@ dtrace_ioctl_helper(struct cdev *dev, u_
 		/* FALLTHROUGH */
 	case DTRACEHIOC_ADD:
 		p = curproc;
-		if (p->p_pid == dhp->dofhp_pid) {
+		if (dhp == NULL || p->p_pid == dhp->dofhp_pid) {
 			dof = dtrace_dof_copyin((uintptr_t)addr, &rval);
 		} else {
 			p = pfind(dhp->dofhp_pid);
 			if (p == NULL)
 				return (EINVAL);
 			if (!P_SHOULDSTOP(p) ||
-			    (p->p_flag & P_TRACED|P_WEXIT) == 0 ||
+			    (p->p_flag & (P_TRACED | P_WEXIT)) != P_TRACED ||
 			    p->p_pptr != curproc) {
 				PROC_UNLOCK(p);
 				return (EINVAL);