From owner-svn-src-head@freebsd.org Sun Jan 14 17:55:41 2018 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 A9FC0E7D37E; Sun, 14 Jan 2018 17:55:41 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 83223212B; Sun, 14 Jan 2018 17:55:41 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ABB9924FFB; Sun, 14 Jan 2018 17:55:40 +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 w0EHteBs069430; Sun, 14 Jan 2018 17:55:40 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0EHteFp069429; Sun, 14 Jan 2018 17:55:40 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201801141755.w0EHteFp069429@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Sun, 14 Jan 2018 17:55:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r327972 - head/sys/cddl/contrib/opensolaris/uts/common/dtrace X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/sys/cddl/contrib/opensolaris/uts/common/dtrace X-SVN-Commit-Revision: 327972 X-SVN-Commit-Repository: base 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.25 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: Sun, 14 Jan 2018 17:55:41 -0000 Author: markj Date: Sun Jan 14 17:55:40 2018 New Revision: 327972 URL: https://svnweb.freebsd.org/changeset/base/327972 Log: Use the thread's ucred struct when fetching jid or jailname. Reported by: mjg X-MFC with: r327888 Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Sun Jan 14 17:01:37 2018 (r327971) +++ head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Sun Jan 14 17:55:40 2018 (r327972) @@ -3664,14 +3664,14 @@ dtrace_dif_variable(dtrace_mstate_t *mstate, dtrace_st return (0); return (dtrace_dif_varstr( - (uintptr_t)curthread->t_procp->p_ucred->cr_prison->pr_name, + (uintptr_t)curthread->td_ucred->cr_prison->pr_name, state, mstate)); case DIF_VAR_JID: if (!dtrace_priv_kernel(state)) return (0); - return ((uint64_t)curthread->t_procp->p_ucred->cr_prison->pr_id); + return ((uint64_t)curthread->td_ucred->cr_prison->pr_id); #else return (0); #endif