From owner-svn-src-all@freebsd.org Tue Mar 3 01:46:37 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 44CC426262A; Tue, 3 Mar 2020 01:46:37 +0000 (UTC) (envelope-from csjp@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48Wfxm6jvgz4421; Tue, 3 Mar 2020 01:46:36 +0000 (UTC) (envelope-from csjp@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 A1216258DC; Tue, 3 Mar 2020 01:46:36 +0000 (UTC) (envelope-from csjp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0231kaC7055916; Tue, 3 Mar 2020 01:46:36 GMT (envelope-from csjp@FreeBSD.org) Received: (from csjp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0231kaod055915; Tue, 3 Mar 2020 01:46:36 GMT (envelope-from csjp@FreeBSD.org) Message-Id: <202003030146.0231kaod055915@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: csjp set sender to csjp@FreeBSD.org using -f From: "Christian S.J. Peron" Date: Tue, 3 Mar 2020 01:46:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r358564 - head/sys/security/audit X-SVN-Group: head X-SVN-Commit-Author: csjp X-SVN-Commit-Paths: head/sys/security/audit X-SVN-Commit-Revision: 358564 X-SVN-Commit-Repository: base 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.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Mar 2020 01:46:37 -0000 Author: csjp Date: Tue Mar 3 01:46:35 2020 New Revision: 358564 URL: https://svnweb.freebsd.org/changeset/base/358564 Log: In r358471, we interrupted the case block that would eventually lead to the path related tokens not being processed. Restore this behavior and and move AUE_JAIL_SET in this block, as it may conditionally contain a path token. Discovered by: kevans PR: 244537 Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D23929 Modified: head/sys/security/audit/audit_bsm.c Modified: head/sys/security/audit/audit_bsm.c ============================================================================== --- head/sys/security/audit/audit_bsm.c Tue Mar 3 00:28:37 2020 (r358563) +++ head/sys/security/audit/audit_bsm.c Tue Mar 3 01:46:35 2020 (r358564) @@ -803,25 +803,26 @@ kaudit_to_bsm(struct kaudit_record *kar, struct au_rec UPATH1_VNODE1_TOKENS; break; - case AUE_CHDIR: - case AUE_CHROOT: - case AUE_FSTATAT: - case AUE_FUTIMESAT: - case AUE_GETATTRLIST: - case AUE_JAIL: - break; - /* * NB: We may want to verify that the appropriate * audit args are being processed here, but I think * a bit analysis is required. + * + * Process AUE_JAIL_SET in the next block so we can pickup any path + * related tokens that might exist. */ case AUE_JAIL_GET: - case AUE_JAIL_SET: case AUE_JAIL_ATTACH: case AUE_JAIL_REMOVE: break; + case AUE_JAIL_SET: + case AUE_CHDIR: + case AUE_CHROOT: + case AUE_FSTATAT: + case AUE_FUTIMESAT: + case AUE_GETATTRLIST: + case AUE_JAIL: case AUE_LUTIMES: case AUE_NFS_GETFH: case AUE_LGETFH: