From nobody Wed Jan 29 18:54:51 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 4Yjrth1glyz5lm5V; Wed, 29 Jan 2025 18:54:52 +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 4Yjrth12g6z4B8b; Wed, 29 Jan 2025 18:54:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738176892; 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=5a8hKqSCE2oGhd5B0dSYdoH2AqHDU5Zx57DRadMkv+o=; b=RgOUR4e2o5/E/F881DD0OlCuHtHEy8uqC4WZNjReIA6eOp3xCVG9KgLqJLGBCC5RGZFVK8 qNTqh47d9pqMMqREvJMMWSIVwxLTB7qJUA9pCLAhZpdafjOXjyWxizlx6Y2NK3lU3djEFP gy3nPqXudXs14W2HiFEDqTELxzixqoPPs+K7+8xC1U2h208VZR7eMOKMbtrExn7S70gGwo c/2Hd8SxsAKmiPgEH8K8IIULv60nk1x2GH7ZtQ8RbJNcsqfKfAkZUOQQ6l0O1Mp+ZCD+GJ 76das+dvNGPozlzfCB0fGcf5N1VnCNCYDmQu4BR2bykYEyyCz7goLWFjDAivEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738176892; 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=5a8hKqSCE2oGhd5B0dSYdoH2AqHDU5Zx57DRadMkv+o=; b=FhLCCWbLDh7wMW6GaD2Ke8zEmGBnc2NfkGDmHX/V0rRlHYJ5oxdBDCah+J7nM5y8/qamp5 l+i33amd/ESzgL2wnBzwbdJOG5+Fwzb2EbJBKDtuTy4+tm8jnoBa5h/Rh4jurmo8B63emN CSJBQYlOZm39cYjGTB+wtwENmyo3KdFxqppZ4wdXl7nWPX7XKyHJdBDvxdIJ0DsqmJD2eo 2MoRuiKm6ZpSclCeIBe3BcN/2Ky+s1rQhbiNah0RsjsVLZ1dPQ1HgkAhdu8lVKH1FDNR+L Ru0Kj+xC3NlI1tL4aXKEPP/f+kGYn3vlV4j3e5aVxQqlgGJF5Yh4UPmWuC1New== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738176892; a=rsa-sha256; cv=none; b=x15Tj/+gcsLYH3RlTB47iViFcU0xwxa1A98GO92I4t6k3NrxFW5VU4m86kkUl1Y2UWSaju xheFWGIlXwKYuigQCqmmkAJGglzlqyQYDedGJyw8Eokx9RVZjx0kqkrf3q2RJ8beZoc0J5 +pAtJXN63xRwuQH1PRyvpSdLK8sxEU2a4CsxoJWM/GAxemWpsHaE4rb5zhYs6xCcCXC6+V DPBBHkAGKj1yYO/+jy8cDbk0qKUIO7BPKymRMydQivdNMn+n2MzHGp/1NAa62nG60SJ47R UBkRRP7GD8aaREFiUKyku9rSM/ChdhLRLtTBJ3rYqDQUn7yYhaORqh8LHphg9w== 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 4Yjrth0bthz1CQF; Wed, 29 Jan 2025 18:54:52 +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 50TIspfc063929; Wed, 29 Jan 2025 18:54:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50TIsp7d063926; Wed, 29 Jan 2025 18:54:51 GMT (envelope-from git) Date: Wed, 29 Jan 2025 18:54:51 GMT Message-Id: <202501291854.50TIsp7d063926@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: 71bf983f92ba - releng/14.2 - 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.2 X-Git-Reftype: branch X-Git-Commit: 71bf983f92ba5f0d8f44ffe33067998dc1a2a8e2 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=71bf983f92ba5f0d8f44ffe33067998dc1a2a8e2 commit 71bf983f92ba5f0d8f44ffe33067998dc1a2a8e2 Author: Mark Johnston AuthorDate: 2025-01-14 14:19:24 +0000 Commit: Mark Johnston CommitDate: 2025-01-29 17:26:27 +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 725467e1215f..25843eec3754 100644 --- a/sys/kern/subr_syscall.c +++ b/sys/kern/subr_syscall.c @@ -143,9 +143,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; @@ -160,6 +159,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)