From nobody Tue Jan 6 13:34:28 2026 X-Original-To: dev-commits-src-branches@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 4dlsb86j2sz6NdWL for ; Tue, 06 Jan 2026 13:34:28 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dlsb84QXcz3Smr for ; Tue, 06 Jan 2026 13:34:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767706468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cI67qpqX4NnIaPZTEDsF/FeN4bFVl+GOcgGg6V2zy2k=; b=xupRkv0izZz/UnNIFsq10n9C4IJ/PCZvy3rfP7vDvCDF72PVRRkpikeYChqXPuH4me58Ho ExlmgafOFWZ3eYtrVRTzeeV6iBCOaOKgv6ohCcPxTfjVczu62VqEapfSuPGRYxyQ5jFupD t+pe+v3s8+wrNkyabG6nkjbR1L4iMig9VFhG2jRWaTnLtCLXEni14TCImfTadWc6oi5wSo uj8wWRwjyeTWvVLMB6oTf/pr8VlETQ8QG5ClTuorQWqeGZM8M9/64c1YQIxkGbL7Ibv9Oa 1l84zZHyrpk1QweRXTbMpwXJi0uGabwZmtdTq3nA/nxj5I3KmYRy63QMCBJwOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767706468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cI67qpqX4NnIaPZTEDsF/FeN4bFVl+GOcgGg6V2zy2k=; b=K0XSVnulLf23iOsncL/sf0xtG3Vzu/C2aY+uL4WP4aT7JuLpzylwgGXtRMsPbJDVBZtBAA fYyA42+BnVRWarNoOPpmE2Ad5QNO3j2AabU5UYABS9kPUPqmbuKfrdgkO26KvUozjcxdtd KxkKOSgDBj8OdAehZmeN9pbPpcpnSzJkcm8TzzvbAmm3HZWleAagG58nTjbgMdEJ3Ma8/e IoA0vn3QijzgVP6BLmOdAYYCQ+JRnRmtdW0hptH5idALBZ5wY42SgQm1BAWdRbSg+sRjtE H6T7fE3mP0FoICRuI89zTtSAXaDklohRt5q95erWDMAOZC85eHM25HMIYpHI9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767706468; a=rsa-sha256; cv=none; b=s78lUrMJj0OedWfVLGtF11kA0pdwHIAfYemqQJ8929A1KHdYokV2NntOn4Ys7/+UcbJ0Bd xwvnsoEL/D4e3rzT9sabEfMaVtMefAPcp4BYMy2M69yFGIR84w/T2OvkW9SvLb0+Pjxlbj XZoPNZYEONGspBReTi+Db1jJXOUNr49QvojeowFSHBNFxUvl0KdWLwLCVpkkSkUX+AdIOV W3QQm9Im93YlpEe9JtQuStUkRhgAWFhQGv7yNMr9GI/qcCD1h1SxpFk5COq6aKczTBCgE2 Mz9l2gYWflORgbTtTD+84YZ8YsaazyYRdXiP9AcpJqorj0FFzOoS4Th1gUaQIQ== 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 4dlsb83z3Pz17XG for ; Tue, 06 Jan 2026 13:34:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fdc5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Jan 2026 13:34:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: John Baldwin From: Olivier Certner Subject: git: 33c0bd25e528 - stable/15 - MAC: Use the current thread's user ABI to determine the layout of struct mac List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 33c0bd25e5283404bbf7be0536ff52fa16f11b6a Auto-Submitted: auto-generated Date: Tue, 06 Jan 2026 13:34:28 +0000 Message-Id: <695d0f64.3fdc5.6b0fdf66@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=33c0bd25e5283404bbf7be0536ff52fa16f11b6a commit 33c0bd25e5283404bbf7be0536ff52fa16f11b6a Author: John Baldwin AuthorDate: 2025-11-24 15:47:20 +0000 Commit: Olivier Certner CommitDate: 2026-01-06 13:33:25 +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 (cherry picked from commit 134d00bd2c910cc7cc21c11fba093ff82bbb9344) --- 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,