From nobody Thu Jan 29 15:40:04 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 4f23HS4tNyz6Qrbn for ; Thu, 29 Jan 2026 15:40:04 +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 4f23HS1w0kz3xyT for ; Thu, 29 Jan 2026 15:40:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769701204; 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=sOQIxzDug11BGm+9kATWIBDnpz+z9Ih0D/LtXTdQomM=; b=Rl1PJPnIteJ5BKvsMAojTYi1aorU38Y8L5KO8UbjwzXUTB9yiceBnVFgh6O3zycriPfdn9 89FdOIHhL/pJ6Jvw1dhIxgcRmlGxbsH6Yl5Y0NCiWzLjKM6wtG5Cv9oUvpBRuMclRKsMzz izfO+NlDQA9MtPr0MEW4mZjJkByty6oUx+0LLWfVeX2q/Z1pKQ7puS20QI5PD8gt1WYRfo X40XFh4ajFJ7ywQ6hmJnF3RhPjLFGMZVEE01VMWBXQfmA9ub3l/zFffR/6IOc9XQscWRFJ HHq2nINkNwWYi6Txhm0TuhVQ5BWolxTHUUpzjqfjOt2Eyo9QPXxdv9calOGxQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769701204; a=rsa-sha256; cv=none; b=GJinorrSzjFxwmjh05tYlnZSKtXxU+cNlE1DpfLjYLNUWUzCoyRjWIZl/zRjPbURFt9rov ckkqcaSMOxo9ZZFy7bzpkW56MPOYbSOE4RrYnNVYzcmiZRQisjh1pjgXYLbBYprNAlA8DW 2BBVq2Ux422yC3EK+qFmR1S2RzvrjWQ+pnv3sqBkhxah3jASwzcqnr/AsQdtLKdMtksSxQ ul8gc6cS/U7V9sI6cuSqCUnSQAds7at5f7qKfLybbeIqWY1gDQ5wEYG8Z24nt8aLW+q8RV HK2rtyYQ2/NHhPXKd5++daKfvInMUP3e8UNv7+90nAQCqOt6U5JjKItyXpgclw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769701204; 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=sOQIxzDug11BGm+9kATWIBDnpz+z9Ih0D/LtXTdQomM=; b=cauBU2pXgz2biDw1DobZ/bfRQuI7uzO3ZL2TtWsOxMCpRW3mHej/cuPH6B9rN6ev6zXFvP iCPfW0qSZLSwgks7JhK/fyiHGlOJ/pAu6Sz1uycvjss9cf1SQ6lxWCP6a24RuNS1MMqWN4 TYFfaUDAjO6tjXoJY23K1s29GsYxdDJfvgQTLjPcot+rLscjNm5KN2nhGNCgJ4C9b+8M3n Ox1qs9txYIb5nZmB9ldrI24nbPkIdHqzL0nx3/PWgcFZuqGCG3j6GOero1v0kmicx3oi8S JuHGrF5+CQZPyaI5WUKeUK/KVMtW16+AWdMeNs7yWtly+ML7vrIbuS6ASdvcvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f23HS1RRWzkmQ for ; Thu, 29 Jan 2026 15:40:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39638 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Jan 2026 15:40:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 7a1a4f10a64d - stable/14 - 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7a1a4f10a64d51f877422da6d4833cc4e2a95265 Auto-Submitted: auto-generated Date: Thu, 29 Jan 2026 15:40:04 +0000 Message-Id: <697b7f54.39638.3fe4df4f@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7a1a4f10a64d51f877422da6d4833cc4e2a95265 commit 7a1a4f10a64d51f877422da6d4833cc4e2a95265 Author: John Baldwin AuthorDate: 2025-11-24 15:47:20 +0000 Commit: John Baldwin CommitDate: 2026-01-29 15:28:48 +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 9edc1fa3f02c..900b6136a1fe 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -608,12 +608,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,