From nobody Mon Nov 24 15:54:25 2025 X-Original-To: dev-commits-src-main@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 4dFVkT544Vz6HQ3Y for ; Mon, 24 Nov 2025 15:54:25 +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 4dFVkT1LPcz3qMl for ; Mon, 24 Nov 2025 15:54:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763999665; 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=I/4C1UqROavZXx3raAA8fIIy+QLX2Nq3MUJ4gaJxZnc=; b=MhdXNhkaBLY7iGAqNTGKKoKJADbot3DzSzQeTFfJWGfbKf1stgbGqiVvrniv/zJEIRQmla Tp2xCVT/xmu9avCd/um6FLYv9M1lj1AlNjNNLINvG8sODMV6hbCjsr1PUW3ScqMkyKjB7t tFLZxTYYGc9gH4GVztpkcT+515ka4sOMjInREkXINAcp8KFy77APjXAdhlm9lDxseBfAU5 pVH1p4cFCdX8RIB6VSl839eTGd54izqe5vKM3zJymL7Pi7yIU78o5a+PVaBAV/aKrmMCve Czv84SQxf5D7MJMh9VCl2xHrZXGmTX5ensYJQO3Gfy/GcWIP6xstJCkGT0P3vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763999665; 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=I/4C1UqROavZXx3raAA8fIIy+QLX2Nq3MUJ4gaJxZnc=; b=AgD/9mvyKpJtzBkdfWcye1Eg6bweL1158hXXH+4CGku7+6U3W486qIQC0r5L9rIuJ6Ep2E ikTaQOhQc1QtB0sizXcGtC5HsiipCv82bm/zkc1s4ryEo94Uvr8W6S0S4n3NHH3nCddYEF HRZZAaisVWUG+d+G2izYEBsgTRzEJ6g0mn3EkfNMrl3Zpa9ymkCI1LTyT03k6494rRvFSU FyFCO7wkGGq++x1XPtHv7FtBZePxskssMgO/YTxF9ITeUPA6RpWNzFP7Vu0v8tk28yL3JX be+v8zYapG1q4Xor5x7yIDJoKWyxMSryN1eSp6nbg5u5K2mNczv81Y/LyBMXEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763999665; a=rsa-sha256; cv=none; b=Q7XEX4Cw0UfvRSTT3CMqnMmhGGS2IHTDW+7VZY1172S7kl2//U4RVbcq1tM3OUsjCRTqVP lziP+FKpr4Nzjee1I0E5FW5oSCoCqN1+k7gn5tB/ltJvDBOyFpUPVe5ZyAcDEcv2Ks1po3 YFEDWNHTE6+FvJeHSUCOGlYFy4sBnUpFzw30h2Njuh21wqkYFbHjSAeofhmNigykVvq2By PcN9DVxrxobuzk8Umq7HMeoE36MTY/c/qsEt/gD82OChQFQ2z8Yx0OYPsLLShe27U7Egr3 VKcLl+oboD2GFR5P70Mwp8xqF9vn1fbG+JLTstQ5pd4mMIXrkofwGkF+mBEv6Q== 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 4dFVkT0JRlz5x9 for ; Mon, 24 Nov 2025 15:54:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35e23 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Nov 2025 15:54:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: f7ab908244e5 - main - freebsd32_setcred: Copy all of the setcred fields individually List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: f7ab908244e50c8c8edf314424c860e34ea3d7e9 Auto-Submitted: auto-generated Date: Mon, 24 Nov 2025 15:54:25 +0000 Message-Id: <69247fb1.35e23.5267f1f0@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f7ab908244e50c8c8edf314424c860e34ea3d7e9 commit f7ab908244e50c8c8edf314424c860e34ea3d7e9 Author: John Baldwin AuthorDate: 2025-11-24 15:49:09 +0000 Commit: John Baldwin CommitDate: 2025-11-24 15:49:09 +0000 freebsd32_setcred: Copy all of the setcred fields individually This is the more typical style used in compat syscalls. Modern compilers are smart enough to coalesce multiple member assignments into a bulk copy. Reviewed by: olce, brooks Obtained from: CheriBSD Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D53757 --- sys/compat/freebsd32/freebsd32_misc.c | 12 ++++++++---- sys/sys/ucred.h | 2 -- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 33b4872ba10f..7913940338c2 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -4249,10 +4249,14 @@ freebsd32_setcred(struct thread *td, struct freebsd32_setcred_args *uap) error = copyin(uap->wcred, &wcred32, sizeof(wcred32)); if (error != 0) return (error); - /* These fields have exactly the same sizes and positions. */ - memcpy(&wcred, &wcred32, __rangeof(struct setcred32, - setcred32_copy_start, setcred32_copy_end)); - /* Remaining fields are pointers and need PTRIN*(). */ + memset(&wcred, 0, sizeof(wcred)); + CP(wcred32, wcred, sc_uid); + CP(wcred32, wcred, sc_ruid); + CP(wcred32, wcred, sc_svuid); + CP(wcred32, wcred, sc_gid); + CP(wcred32, wcred, sc_rgid); + CP(wcred32, wcred, sc_svgid); + CP(wcred32, wcred, sc_supp_groups_nb); PTRIN_CP(wcred32, wcred, sc_supp_groups); PTRIN_CP(wcred32, wcred, sc_label); return (user_setcred(td, uap->flags, &wcred)); diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h index 12d34d990bff..ba241cf9ff3a 100644 --- a/sys/sys/ucred.h +++ b/sys/sys/ucred.h @@ -181,7 +181,6 @@ struct setcred { SETCREDF_MAC_LABEL) struct setcred32 { -#define setcred32_copy_start sc_uid uid_t sc_uid; uid_t sc_ruid; uid_t sc_svuid; @@ -190,7 +189,6 @@ struct setcred32 { gid_t sc_svgid; u_int sc_pad; u_int sc_supp_groups_nb; -#define setcred32_copy_end sc_supp_groups uint32_t sc_supp_groups; /* gid_t [*] */ uint32_t sc_label; /* struct mac32 [*] */ };