From nobody Wed May 3 06:56:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QB75t49kKz490bB; Wed, 3 May 2023 06:56:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QB75t3fbqz4Snm; Wed, 3 May 2023 06:56:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683096994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PiGWZtwpcx+aBd3Er55B3Rw+uCqGItNZ+weJpZvuF4U=; b=kZ9h4fZm8FqPbYLbdjbIgX9ujUbDOXLCtYGgLf2JyygIR4z28J1EaDpx/JmxE6ymaRj7xD wl2NaLPOrpeaMnUbk2Mg+5Vhx1LxnEpFmrjSsQNvrOLROzHqSvuy5sdraHCqa0fnFm7YPj NboUaBDknn9JctdCruBtQGwGJn9AaMRR2YjlehkkIZWJuTTxzrh48iBh9cn0zLWbKHzT2E xGdPqXMe19x62HLeH+WbfWh0N/6WU0ggDju8qF4gAeU2u2X16cIMA3XDCfncciWGcchXyU VNghK9TLshIKxtj4wi8nXp6JvYH/DZh5+iJE0rKT4rC0he8Sdx2Qv8QoZA6CsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683096994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PiGWZtwpcx+aBd3Er55B3Rw+uCqGItNZ+weJpZvuF4U=; b=GI4l1nINeKbJ9mKv+/GtbAEq4REYsu5HFGSBLrPS67xX6+X/AyLagYXkEOw4HDQps7/guB cgBDrbudU4tWAETCd/Oh9nlv6G83iJV7UqqOLvmNhaseae8/jEUrMIy06pINMD/a82bvgH vUP5D4DB+6PSGJ4Fuk4ZhJSMW59YQS3sc1LE1KUpKaor0z9mf03plTMhOfsd6UtWxU30Jr Ky7jiETGPCUa6tEumqWRGDwjEm7LOTkXxd3T9WsSI379CoZ8hh9/1Zg5LBiZv9kAlOT94d 1ZN35VXsraOft94U0Ftn0qCKkxI3rt67oYXKkFqM7qexGAYtiabj+E+G1Nj/rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683096994; a=rsa-sha256; cv=none; b=fLnixRRE8w74xeskdy1Jg7dr4+1MsS9y0fINfsfPF+OXcC42dP+29DjmEtOmNyk+w7oNgT yaBzWHOgQBtyUrFbgCB/r5JCZhhTT6asemmkAfV5qhgBPXN3hsWiSPEd4OOvuuhyokIlif 6NRZTzhNHVhgMiENzWlM5UH0JChv3Xki2dizd8f3lcmg0Kf1AxLcCJwW9ctX9ubCDhhQWY eosnrozLUDgknzHfgHSXwFlxkvtofw15JpR/u+k3LAMW2NF5KPiR3hukoJMSv5kJ3zn5Zu GRRQmOrQxNWWS0yjuTaS43zayR7EwZLxRoETA5BQcgL4lcEyU6hce3rC/AEjrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QB75t2k57zLTm; Wed, 3 May 2023 06:56:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3436uYBm016473; Wed, 3 May 2023 06:56:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3436uYYp016472; Wed, 3 May 2023 06:56:34 GMT (envelope-from git) Date: Wed, 3 May 2023 06:56:34 GMT Message-Id: <202305030656.3436uYYp016472@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: cf0fc64bc2f9 - main - vfs: reduce audit branching in namei_setup List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf0fc64bc2f91bc00c78b316b51a0aaac8b53235 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=cf0fc64bc2f91bc00c78b316b51a0aaac8b53235 commit cf0fc64bc2f91bc00c78b316b51a0aaac8b53235 Author: Mateusz Guzik AuthorDate: 2023-05-03 06:56:10 +0000 Commit: Mateusz Guzik CommitDate: 2023-05-03 06:56:10 +0000 vfs: reduce audit branching in namei_setup --- sys/kern/vfs_lookup.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 66a8b267f346..a75ea4ca16d6 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -372,10 +372,12 @@ namei_setup(struct nameidata *ndp, struct vnode **dpp, struct pwd **pwdp) /* * If we are auditing the kernel pathname, save the user pathname. */ - if (cnp->cn_flags & AUDITVNODE1) - AUDIT_ARG_UPATH1_VP(td, ndp->ni_rootdir, *dpp, cnp->cn_pnbuf); - if (cnp->cn_flags & AUDITVNODE2) - AUDIT_ARG_UPATH2_VP(td, ndp->ni_rootdir, *dpp, cnp->cn_pnbuf); + if (AUDITING_TD(td)) { + if (cnp->cn_flags & AUDITVNODE1) + AUDIT_ARG_UPATH1_VP(td, ndp->ni_rootdir, *dpp, cnp->cn_pnbuf); + if (cnp->cn_flags & AUDITVNODE2) + AUDIT_ARG_UPATH2_VP(td, ndp->ni_rootdir, *dpp, cnp->cn_pnbuf); + } if (ndp->ni_startdir != NULL && !startdir_used) vrele(ndp->ni_startdir); if (error != 0) {