From nobody Mon Nov 24 15:54:22 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 4dFVkR2BpDz6HPvZ for ; Mon, 24 Nov 2025 15:54:23 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dFVkQ6bHJz3q9r for ; Mon, 24 Nov 2025 15:54:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763999662; 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=mrXDoMFdvN5LugwxiJEoaPwZyJpBW/Uz+i22AC21FQ4=; b=YFztQTb3HNxgkoIrthBrEJMM85MBPm4Qluoo5sl5DdUU9+pFv50Y5cuct3HCWtjLpJf9Xc 2qVrO7Slr0Mdix+vAPuIgj0bd6ZEVjqtygxOFNDu4U3OHXdydaH/2KOKmx+aUjXDkTSxTv 57fK/Y1oinyaufSZC/f/PQsp4QgnnaUrPXb24oHU9Es1ZZ6zLQKtWtHtFLo55iHtsBmxNO RjknKmYBPCcG8uVuYGuI3ePfziftgyxCwScBxtfraupneRQdgbe268iicQGgc5WkFbHr9U T1xvKSp+TgA0TF1lchqGxrfdm9EQ6wRtU5hVAXrMDqk90fhXVt9MchYnsWwCZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763999662; 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=mrXDoMFdvN5LugwxiJEoaPwZyJpBW/Uz+i22AC21FQ4=; b=q5HZXEe+1+XlSqldNFHDNpSY8VOvWEeivP7yyDYCf7Wze9L0KP0dRgMt4yvnmu2Rl3pyZE 3SBT1jT8uKhqNJUQCEylJ7T64CWFXYShdJKvO22dY7MqIX3TMzXgDL9ptZPoaSFQubEHrg mNYjts3Z7jOum0qjtbxfLmW0+23qV1drt+0mbm5ZNBxcqqDHsDDdkN839exrtwNx88z/+v 0u2m+ldAshp6yVFZUL8LkVJflowpVcveCVT0B+reuznlfSwKx4P48tl+QbLgtRP31GeQF4 XqHOSDTDtcz+S4isrKg01oF3WZmOCG3j8dwOziu1DhirLRkpwZX2IFerQN/ZcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763999662; a=rsa-sha256; cv=none; b=TNuWr5I+WFU6/XxawXgQ5kwo1csiPUk5n2H1Wh1n5JEVfcvZDzl/fSDGpYB3lAcwYEqW7m naZ3iPceZoFkfcT8mkXvadYyXaF1brL+0JThjoIuHovMhD/ZrqWwebKbxJWtrmIivnknxx m0XxOHWTHpEND27UIm4Jp/69xws545FYOtbz2m242nzm92OR9DINai12yKnGuJ9Cgu462s EPqk2vn97uI4hyUM2/fhRM037Duto7xxEoxpB+TvWEjG+fz/nNh6VEokQIWJMDh047gXNS baKDrvCX0Sg2fjTeFgLfqFxnvx1FnJ0+tNnZ2E5GLVxoLXcjSs09c4wkgZR/5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dFVkQ68N1z5fS for ; Mon, 24 Nov 2025 15:54:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36bd4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Nov 2025 15:54:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 134d00bd2c91 - main - MAC: Use the current thread's user ABI to determine the layout of struct mac 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 134d00bd2c910cc7cc21c11fba093ff82bbb9344 Auto-Submitted: auto-generated Date: Mon, 24 Nov 2025 15:54:22 +0000 Message-Id: <69247fae.36bd4.2f8d77a7@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=134d00bd2c910cc7cc21c11fba093ff82bbb9344 commit 134d00bd2c910cc7cc21c11fba093ff82bbb9344 Author: John Baldwin AuthorDate: 2025-11-24 15:47:20 +0000 Commit: John Baldwin CommitDate: 2025-11-24 15:47:20 +0000 MAC: Use the current thread's user ABI to determine the layout of struct mac This removes mac_label_copyin32() as mac_label_copyin() can now handle both native and 32-bit struct mac objects. Reviewed by: olce, brooks Obtained from: CheriBSD Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D53755 --- sys/kern/kern_prot.c | 7 +------ sys/security/mac/mac_syscalls.c | 25 +++++-------------------- sys/security/mac/mac_syscalls.h | 9 +-------- 3 files changed, 7 insertions(+), 34 deletions(-) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 81099aa7d28d..5d57cdb7928d 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -635,12 +635,7 @@ user_setcred(struct thread *td, const u_int flags, #ifdef MAC if ((flags & SETCREDF_MAC_LABEL) != 0) { -#ifdef COMPAT_FREEBSD32 - if (is_32bit) - error = mac_label_copyin32(umac, &mac, NULL); - else -#endif - error = mac_label_copyin(umac, &mac, NULL); + error = mac_label_copyin(umac, &mac, NULL); if (error != 0) goto free_groups; wcred.sc_label = &mac; diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c index 26181781a394..13c7998041f9 100644 --- a/sys/security/mac/mac_syscalls.c +++ b/sys/security/mac/mac_syscalls.c @@ -57,6 +57,7 @@ #include #include #include +#include #include #include #include @@ -94,15 +95,15 @@ struct mac32 { * after use by calling free_copied_label() (which see). On success, 'u_string' * if not NULL is filled with the userspace address for 'u_mac->m_string'. */ -static int -mac_label_copyin_impl(const void *const u_mac, struct mac *const mac, - char **const u_string, bool is_32bit) +int +mac_label_copyin(const void *const u_mac, struct mac *const mac, + char **const u_string) { char *buffer; int error; #ifdef COMPAT_FREEBSD32 - if (is_32bit) { + if (SV_CURPROC_FLAG(SV_ILP32)) { struct mac32 mac32; error = copyin(u_mac, &mac32, sizeof(mac32)); @@ -138,28 +139,12 @@ mac_label_copyin_impl(const void *const u_mac, struct mac *const mac, return (0); } -int -mac_label_copyin(const struct mac *const u_mac, struct mac *const mac, - char **const u_string) -{ - return (mac_label_copyin_impl(u_mac, mac, u_string, false)); -} - void free_copied_label(const struct mac *const mac) { free(mac->m_string, M_MACTEMP); } -#ifdef COMPAT_FREEBSD32 -int -mac_label_copyin32(const struct mac32 *const u_mac, - struct mac *const mac, char **const u_string) -{ - return (mac_label_copyin_impl(u_mac, mac, u_string, true)); -} -#endif - int sys___mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap) { diff --git a/sys/security/mac/mac_syscalls.h b/sys/security/mac/mac_syscalls.h index 4efeaf300d31..f95ff3ef1264 100644 --- a/sys/security/mac/mac_syscalls.h +++ b/sys/security/mac/mac_syscalls.h @@ -19,17 +19,10 @@ #error "no user-serviceable parts inside" #endif -int mac_label_copyin(const struct mac *const u_mac, struct mac *const mac, +int mac_label_copyin(const void *const u_mac, struct mac *const mac, char **const u_string); void free_copied_label(const struct mac *const mac); -#ifdef COMPAT_FREEBSD32 -struct mac32; - -int mac_label_copyin32(const struct mac32 *const u_mac, - struct mac *const mac, char **const u_string); -#endif /* COMPAT_FREEBSD32 */ - int mac_set_proc_prepare(struct thread *const td, const struct mac *const mac, void **const mac_set_proc_data); int mac_set_proc_core(struct thread *const td, struct ucred *const newcred,