From nobody Thu Jan 29 15:40:06 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 4f23HV5cT2z6Qrpk for ; Thu, 29 Jan 2026 15:40:06 +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 4f23HV2mk1z3yBC for ; Thu, 29 Jan 2026 15:40:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769701206; 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=rY+RfJs48sjW3qdsPAdsFmEw7Eo0cH3yw/2LnizUNGw=; b=I5dXtkRedfr8fP2/M3v6veITj2lpf3g0+v9GIP57G3aCfafe3Vs2fir4NSJ6bgKocHkuQl 5/99DNeJVc+0Nogn6x0xHxy0ptzWPF/Bx+rnsJkBJ5OgObD9Nau67tDyAozQGUfPd9YHfm IuifBLhb0h9BqyZRA94t+H5GnUHKsjQf5jn6z1bsZfkZWM/XBCqdVGC7aOI0W4AFQGYFcO TdtfctpfXmAprn7twlLTmfW7G27SPItVQvL530iZ5O03h/zW8CGjOQlyihbDKi/KnJ+zXA UQ1EhCVip3qE08m6AWqMoVl8+Gpwm4gS83MNQeTMslFHp7O1h4ZvQsbAGjQTPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769701206; a=rsa-sha256; cv=none; b=BoIlzOXWoaTYIdUYgSPM15DQ/bArlXyTr+uqARykqojqT2uetCUEqGob2RVkYrfQB9mvvI XXSMSD7lbYWsyPMnOYRhY/Ed4zSrqdWv340LnrpRJnWa/bi/VQ5BQi03mUHFhCf0UNMErv GRkNhgf/iUV72mFfhcZJm5RmIaef5Y28P4lQorIrsvDbM6oGZg2w1zBOvO4mKoi/JhCv6E ECLHR4ojsPwAEoBmE0dR3cb1rn3VcLzPr9oG6iwB1T9eEUvWIYbazcRFXMIpYVDlCyKcj5 b2d7AA0DM1ttMYkiqM4SxrP+CxBUt0KrzAAAmbWQy9ZVWdxRx1XnBsQ3+wSX5A== 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=1769701206; 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=rY+RfJs48sjW3qdsPAdsFmEw7Eo0cH3yw/2LnizUNGw=; b=tfQSXbSVRv/X82cHy2YPKIphiM/3HReSW5heuwsIP3So3Qov63+oJY8+9jDdOOVgmPTEKW LWhbASp6ENP67XqRuVIYOLTb6c81iY7630Ly+jG7ldiGOweHJ7oP7e/cvMZHfIGmx9CjUB xOyfu+Hv02VQPAM9zXhM9wOyzQgDc6CXfDp18dXzKr1wpDAQ12B06Nd6X5xPOU19iODA+v KwwHKvdCzDlhw1hPtU+I/H8/v3QJ8WIqpOmCYkWmkL2z7OJe6m5OpRNAHGopOw7CqtoLNU LLarpVgFRGIjBxzaD2t6Mb8gyIBvbHe/yD8bWUTC1jkkuyds+pxsnKeNWZRoEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f23HV2CrmzkyF for ; Thu, 29 Jan 2026 15:40:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a595 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Jan 2026 15:40:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: d203bd96bb25 - stable/14 - freebsd32_setcred: Copy all of the setcred fields individually 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: d203bd96bb253981ca8767caf36ee9d7771bbce3 Auto-Submitted: auto-generated Date: Thu, 29 Jan 2026 15:40:06 +0000 Message-Id: <697b7f56.3a595.1cddbc1b@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d203bd96bb253981ca8767caf36ee9d7771bbce3 commit d203bd96bb253981ca8767caf36ee9d7771bbce3 Author: John Baldwin AuthorDate: 2025-11-24 15:49:09 +0000 Commit: John Baldwin CommitDate: 2026-01-29 15:30:48 +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 (cherry picked from commit f7ab908244e50c8c8edf314424c860e34ea3d7e9) --- 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 320b739deeab..13152d9d3588 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -4246,10 +4246,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 d018e10d14a9..d8b999e27db7 100644 --- a/sys/sys/ucred.h +++ b/sys/sys/ucred.h @@ -171,7 +171,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; @@ -180,7 +179,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 [*] */ };