From nobody Wed May 13 17:22:50 2026 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 4gG0f26SGYz6ck8Y for ; Wed, 13 May 2026 17:22:50 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gG0f21wCHz41rP for ; Wed, 13 May 2026 17:22:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778692970; 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=G0SDCrdDGQavxBks7jqetSeBcdVploVk6p3D/C2XxI8=; b=huJSPH4u9XTafJxlmckSUmFwwHby8IZL9fk3l29duj585i6HXcZk0ZCE+f4dlktI4kKbUs zTVT/QCAglIcOImPMH9dhTEA7v/IojkTkm5zYMfvLueKgzDDXgJYlfoy2jY8kjDxEgzOOs pMoD7K/Zk5iE6mBWaM0GxfW+eBh48/SNoGVyg9/f6qT3CXtVmheGYelVMFQ8HVqAS8xTUr aoK4qgInhmHCvyh5UPWiIh8tjgAzNuFWVv/F0v5WqktOoQPNe7zvFwqrSxYBllr08dBqS8 Z8FwP0sUCbaqrZ/J16/O0zMFSr7F8Y9TcSJPHFNrTYKX/pb7mzoN5UHHRwev1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778692970; a=rsa-sha256; cv=none; b=m5rMT59dHOVztbz5Qsc8vpIaBgKOCvTf0H3kYGXOIP6Z+j7VRAW2mhLxXcTmc5wWRn5XSu 7JXJjg5t9j39cEuKzQm47ES5jEeltAOdTtcpDbo5Ym7izTFHPiaROyg921TJmwHpi0pDzp IYjxZJd99QffVhcDfM/ImadnOU/KyZS1qxbsVqzFim17CA5x9Zg8P9pO+L+ug/1iaRH1AS C6+pGSrPJ8E13dcfWSBnYyENe/mFy8sjOF4gIMODsNkPy6YUEvho2ZHsr1rFrJi57FtJRA y0RqzBzYIiWmoHyEtERxcp3qROvhi1G4aO8Bu/QES19XOay30mNgg16pRMEh0Q== 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=1778692970; 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=G0SDCrdDGQavxBks7jqetSeBcdVploVk6p3D/C2XxI8=; b=i861U8IYMdtx+gYmhoqdifqYrywF+Hqw+bxPrMC/g0GWu/+LczjuX020+oQzV1uiHNfHMK GWieAd8ryVh6+qLt9nfFQqYr4U7lvL7GbVOfvCVkyJ2UgZrsriV/07tseJ9EXh543muri7 LPxeyA8CqnrYwaeUA5kgtM//OhYg0tnYOKs68RFaYNCg8ds795k36BQ0KBa3A1b9UMeT7b 44dWBdvz8PDhUS1gULRi+W0z+OR5Ud5AtwUHzF1jF3R5NRvMa2/VMkX7FZkvgh3IxqWAFc PIY0QfDTszQSiiIB3zRAVDucl0DLl45UzdlM2NDH7DxIpy8M9RbR2AvgAuxkVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG0f20x9Pz10XY for ; Wed, 13 May 2026 17:22:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19d83 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 17:22:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 3298d82ea340 - stable/15 - Fix LOCAL_PEERCRED in 32-bit compat mode 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3298d82ea34059354dc1ff1a60d8b7d3e495c2cd Auto-Submitted: auto-generated Date: Wed, 13 May 2026 17:22:50 +0000 Message-Id: <6a04b36a.19d83.51259bdf@gitrepo.freebsd.org> The branch stable/15 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=3298d82ea34059354dc1ff1a60d8b7d3e495c2cd commit 3298d82ea34059354dc1ff1a60d8b7d3e495c2cd Author: Alan Somers AuthorDate: 2026-04-27 23:46:53 +0000 Commit: Alan Somers CommitDate: 2026-05-13 16:54:53 +0000 Fix LOCAL_PEERCRED in 32-bit compat mode Previously the cr_pid field would be incorrectly copied to userland, due to a size mismatch between the structure as defined in 32-bit vs 64-bit builds. Fix it by converting the structure before copying it to userland. PR: 294833 Sponsored by: ConnectWise Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D56675 (cherry picked from commit 1d24638d3e8875e4b99a4b5e39f4241e37221b3d) --- sys/kern/uipc_usrreq.c | 21 +++++++++++++++++++-- sys/sys/ucred.h | 11 +++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 44d0185e9d1c..8e8261c9644e 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -83,6 +83,7 @@ #include #include #include +#include #include #include #include @@ -2755,8 +2756,24 @@ uipc_ctloutput(struct socket *so, struct sockopt *sopt) error = EINVAL; } UNP_PCB_UNLOCK(unp); - if (error == 0) - error = sooptcopyout(sopt, &xu, sizeof(xu)); + if (error != 0) + break; +#ifdef COMPAT_FREEBSD32 + if (SV_PROC_FLAG(sopt->sopt_td->td_proc, SV_ILP32)) { + struct xucred32 xu32 = {}; + int i; + + xu32.cr_version = xu.cr_version; + xu32.cr_uid = xu.cr_uid; + xu32.cr_ngroups = xu.cr_ngroups; + for (i = 0; i < XU_NGROUPS; i++) + xu32.cr_groups[i] = xu.cr_groups[i]; + xu32.cr_pid = xu.cr_pid; + error = sooptcopyout(sopt, &xu32, sizeof(xu32)); + break; + } +#endif + error = sooptcopyout(sopt, &xu, sizeof(xu)); break; case LOCAL_CREDS: diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h index ba241cf9ff3a..4bf48a5e4b87 100644 --- a/sys/sys/ucred.h +++ b/sys/sys/ucred.h @@ -193,6 +193,17 @@ struct setcred32 { uint32_t sc_label; /* struct mac32 [*] */ }; +#ifdef COMPAT_FREEBSD32 +/* 32-bit compatible version of xucred */ +struct xucred32 { + u_int cr_version; /* structure layout version */ + uid_t cr_uid; /* effective user id */ + short cr_ngroups; /* number of groups (incl. cr_gid). */ + gid_t cr_groups[XU_NGROUPS]; /* groups */ + pid_t cr_pid; +}; +#endif + struct thread; /* Common native and 32-bit compatibility entry point. */