From nobody Wed Jan 29 18:55:18 2025 X-Original-To: dev-commits-src-all@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 4YjrvD41Dmz5lmnZ; Wed, 29 Jan 2025 18:55:20 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YjrvC05NLz3CTB; Wed, 29 Jan 2025 18:55:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738176919; 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=xo3z1QipZpeQyqXtZ9hYqKS9VlaDDPENi4TI0PdhA3Q=; b=t2pP4CKo78EhTVnbFB+9Tqlh0lwnHYmOUl794KAiEbaMGah6UB9xbEpFqGPgpLBmFrRvvZ fXs9sDMuOF6vElO5gKof3ONwWUUW87SVVmjIaHFjyyfhxRbJx17OqJ9wIpIzNHlX+o6Ig2 8Lfq9lSdnKwikglOKLHKDm0dRJlQ3EBmTad8UpTgYvU7kPa7dnAezzbMeN265xlYTbB/Fe bTOa8zeaVEk3dE0DDXcmsfO5mvBeBNh1HOo8b1nFwMO9+L4gE0aTgc/WrN7EqSjLHYoZaA pbKfAQj2TYMplKsPj6zspEWvSuB7pWdq4PqRi1p5glAAYJxwRTPBmfTYPv5fOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738176919; 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=xo3z1QipZpeQyqXtZ9hYqKS9VlaDDPENi4TI0PdhA3Q=; b=SCdPVGpB9NgA0F3NzFVW2NbwjFkP1v7G57ikxtv2sc80to8OUwx1yCG1ds8lz1o+LMy+P9 HQBmuGQgQIBhMj3cubwzVXa/0LLeEp+9n1Lf5JoJeILACuNZ4tRNFjxOT8n/xGSrK06Ovn t98zVfXBSPP5MxSC/toSaV45mXlvEDRkGNQU0ze/Jzo3KEBXuZw4wyoRznFWsW5HNhZvFR rxncrEnFghv+mK+U7ieH1Y7R/MOVcp//eQcbc1Gm45dS683Op6Qf5x6JFo6iIwOzuaS3To hp6EIxw9MGaJ60vrMwO76OmbQsJE4keX0GZBKWQcTn9X7PIQyX9oGsSRKTFHZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738176919; a=rsa-sha256; cv=none; b=oCZwKA3FLadn+S+4Cb3P7qjDcHfOy/m+fxKRu3hEd/lX7KVkw2KTRfqkitY+XDm0dRCs1D POhmoJN9ozzQ1t3nIkPU3fgFs241IsRqlPGFR+btv+mKOIvj+tcVsuqYkGgYuTkXl+6Y13 bwKUwwtLE1KMGX1MFuMIvOP92X9V42TJH9ag2xOAwA+kK0TevRjmj8vmrZLtBRhIl5O/Cq uwN3/Dqu5vjwyXTGka8NXoeu77vK/sk8odS932judtbZJlrdbCd4IZfYAJ+Zj5/d8cKGpo GkMCxROISBng6Y0WijM1nrptZI2sHROSc4E6qhj2RWwtTyALxN+ephNogwQgyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YjrvB6nWZz1Cl4; Wed, 29 Jan 2025 18:55:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50TItI4U064510; Wed, 29 Jan 2025 18:55:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50TItIpi064507; Wed, 29 Jan 2025 18:55:18 GMT (envelope-from git) Date: Wed, 29 Jan 2025 18:55:18 GMT Message-Id: <202501291855.50TItIpi064507@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1574c53178e9 - releng/14.1 - audit: Fix short-circuiting in syscallenter() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 1574c53178e98cbe65019b04e726dcac980a0bb8 Auto-Submitted: auto-generated The branch releng/14.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1574c53178e98cbe65019b04e726dcac980a0bb8 commit 1574c53178e98cbe65019b04e726dcac980a0bb8 Author: Mark Johnston AuthorDate: 2025-01-14 14:19:24 +0000 Commit: Mark Johnston CommitDate: 2025-01-29 17:11:43 +0000 audit: Fix short-circuiting in syscallenter() syscallenter() has a slow path to handle syscall auditing and dtrace syscall tracing. It uses AUDIT_SYSCALL_ENTER() to check whether to take the slow path, but this macro also has side effects: it writes the audit log entry. When systrace (dtrace syscall tracing) is enabled, this would get short-circuited, and we end up not writing audit log entries. Introduce a pure macro to check whether auditing is enabled, use it in syscallenter() instead of AUDIT_SYSCALL_ENTER(). Approved by: so Security: FreeBSD-EN-25:02.audit Reviewed by: kib Reported by: Joe Duin Fixes: 2f7292437d0c ("Merge audit and systrace checks") MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48448 (cherry picked from commit f78fe930854cac6eed55859b45e0a7b5d87189d6) (cherry picked from commit 4b9ba274d736de74676051c8f13e7d3dd536334b) --- sys/kern/subr_syscall.c | 8 +++++--- sys/security/audit/audit.h | 5 ++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sys/kern/subr_syscall.c b/sys/kern/subr_syscall.c index ff13672501b2..9b66cbe5c5fc 100644 --- a/sys/kern/subr_syscall.c +++ b/sys/kern/subr_syscall.c @@ -140,9 +140,8 @@ syscallenter(struct thread *td) sy_thr_static = (se->sy_thrcnt & SY_THR_STATIC) != 0; - if (__predict_false(SYSTRACE_ENABLED() || - AUDIT_SYSCALL_ENTER(sa->code, td) || - !sy_thr_static)) { + if (__predict_false(AUDIT_SYSCALL_ENABLED() || + SYSTRACE_ENABLED() || !sy_thr_static)) { if (!sy_thr_static) { error = syscall_thread_enter(td, &se); sy_thr_static = (se->sy_thrcnt & SY_THR_STATIC) != 0; @@ -157,6 +156,9 @@ syscallenter(struct thread *td) if (__predict_false(se->sy_entry != 0)) (*systrace_probe_func)(sa, SYSTRACE_ENTRY, 0); #endif + + AUDIT_SYSCALL_ENTER(sa->code, td); + error = (se->sy_call)(td, sa->args); /* Save the latest error return value. */ if (__predict_false((td->td_pflags & TDP_NERRNO) != 0)) diff --git a/sys/security/audit/audit.h b/sys/security/audit/audit.h index e7a9c83afbb3..3c8419a54ccc 100644 --- a/sys/security/audit/audit.h +++ b/sys/security/audit/audit.h @@ -389,9 +389,11 @@ void audit_thread_free(struct thread *td); audit_arg_vnode2((vp)); \ } while (0) +#define AUDIT_SYSCALL_ENABLED() audit_syscalls_enabled + #define AUDIT_SYSCALL_ENTER(code, td) ({ \ bool _audit_entered = false; \ - if (__predict_false(audit_syscalls_enabled)) { \ + if (audit_syscalls_enabled) { \ audit_syscall_enter(code, td); \ _audit_entered = true; \ } \ @@ -468,6 +470,7 @@ void audit_thread_free(struct thread *td); #define AUDITING_TD(td) 0 +#define AUDIT_SYSCALL_ENABLED() 0 #define AUDIT_SYSCALL_ENTER(code, td) 0 #define AUDIT_SYSCALL_EXIT(error, td)