From nobody Fri Jan 17 13:40:36 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 4YZLTc3vZmz5l0bK; Fri, 17 Jan 2025 13:40:36 +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 4YZLTc3Hknz3mGT; Fri, 17 Jan 2025 13:40:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737121236; 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=iG+iFhvqGenVhUfNQ3ICUN91S/nKHn1sUqujOpcvYRc=; b=ajaX285YGSuYt9KFR9tQJHslZR7aU4RBi1GyLe8lFeN8CYo2MiSZK1WqYYzZlDugQ1C2sJ E9xdnOXNQLCTfrVwGwXnFwpG4JhQsyHHu8a/6ocTg6PoFeS6N6v8B8+wRtDkl2A+hRa1mr +nfyn+02liQpV2yt33L9Yiz5ZINzHCp6PMWAuPOuOvNWFl6qjJCR0ux/RgktSUe8hQYDE+ RzYpV3tHhn5IxFV1R4tUf1Z/pLwBk2O0QwCYRClKXSmwvTcsy4hP5VSbISC5offLeFyUr1 XEthzYnEDCRDpXXOzscCUWJFOb6fWj5Ul6bUo5niMHZfDSoKXPmgFsHYkXosQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737121236; 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=iG+iFhvqGenVhUfNQ3ICUN91S/nKHn1sUqujOpcvYRc=; b=ruBKWqR8VXMfUEBdtJ4pMOAdYYVj+YPs8e+Y3tLweExqvtQfVt5YfOma94kHW9p97tYj3r fLYmyZMHQVoAhEa7751u992E9c8K/L581wDrvU+k9W2Hr4hjMuLuoZbLyB1SdsLL8ZNoz8 bLJr5wNzOhLpbmcFcf3WAnddx78v0aDciZpjeZYBwctXgWfE6knlfU4WuMASFaxq0Zb1VI 5lMV3mgJW3xDg4sre4DZrmQpcpjjkTm+DQy7ZLv5tNayYu5Qbl21ALSwroCY+6cBlHHPFg UHR1VInlMsg5u/iuLIfTU2CUwBncmAfdN5H0jhE7UfWczEO+sw+zlu4oV2Pwcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737121236; a=rsa-sha256; cv=none; b=wf32GztWpwWifSjGZNHaJhFMTyxroDKkKLMLjeDNoioU/ZFupmXq+8ClCC1FvFHluqMAG8 xGMqrIN1/Lvf0qeQcb1eZCZBtUB48XTLMZRd1TmJeIfPGCxpXoPyLnSEDk6cOZ3EJzdrqe cFmpQmhGQeYpCumhn3b4QFT+ZVKV0TLVsOO6zErJJDMvFzGK6q4HJAFY4sUw30O4X2c7pa 21bZYOlncZa4Vg/Sf3tu146A9C4C7ddP0W6RF2X6SVUxZDXNwppgT4Tjhzj3oo8Orf4qT7 p0+IsJ3ktil61wDVfeeoOMoc/1yi3fClbqiCJ+a/ub7qgor7+Lv2Jb/K1zoKPg== 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 4YZLTc2YpDz4xb; Fri, 17 Jan 2025 13:40:36 +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 50HDeaLl096041; Fri, 17 Jan 2025 13:40:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50HDeaYg096038; Fri, 17 Jan 2025 13:40:36 GMT (envelope-from git) Date: Fri, 17 Jan 2025 13:40:36 GMT Message-Id: <202501171340.50HDeaYg096038@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: 4b9ba274d736 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 4b9ba274d736de74676051c8f13e7d3dd536334b Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4b9ba274d736de74676051c8f13e7d3dd536334b commit 4b9ba274d736de74676051c8f13e7d3dd536334b Author: Mark Johnston AuthorDate: 2025-01-14 14:19:24 +0000 Commit: Mark Johnston CommitDate: 2025-01-17 13:18:51 +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(). 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) --- 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 b87dd52e0773..28e84dce79f3 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)