From nobody Thu May 14 19:05:12 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 4gGfsh4KRZz5WqtL for ; Thu, 14 May 2026 19:05:12 +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 4gGfsh1gkgz47Yg for ; Thu, 14 May 2026 19:05:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785512; 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=6BxkH8yyHsJBlSglF/6hP7gVHcO1Bk6K7i6tBigN/Jk=; b=vAR/l9sV+BKKlmRIRDmk1k+X4HcY4Xpz3N+0c7bIpYE53eAIHhBi0G0lwrI/w2CmnCA9bG fQc/By1z/swpVpdxAQTsfPYdTTy17v22LpZ5fCxwVvKRivMwHiEgmG2IuPAT+TWjMwfy+N ZQkJtCyLUoT2LDAQTTsK+oQdJ/76DHygNDJe12ahjuxO9acZHg8JKsXuw5fViIlwUS9QG8 fGnBMtdaYdxTkecKsjf7h1DIn+ylsTkBj5St1+7x54oO27FpF2kHcU37PFrIp4x91xyfHU u50nPfKo6367Clt50jXU4YxSYioHSHW7+yD6J0932UNWRPXSNn3BHA0Psctxaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785512; a=rsa-sha256; cv=none; b=YOnh2FH0CeSxKEQbF5HG/K9iKuSSKb6jYAJ3XY2FZ6o1q4b7VeqGV1S45wzu3HChJvn/+Y G4e2VPgJpLsqQ6qSBDRRHGiiC/Ad62h4bXCmOGOINkP4DuDeo5DWPZnPvw9rA1KMuS0ana qR/Z/jkVlSTsrU+UgX3qm07meH5tJPLstGIPhoXmpLIGklBagwr7chBt2Y12yERh4Oo6IF d6+ILpkXhtg2qfS3HXgNJvkFMnkmo7OzQYSPN6awg1Hl+5aX5RBrN5lst9ZnBl+Qo1GD7+ x2gLLJGFqTgIqhgZpKw6pUKP4v6hQ6oFA9BmJsugQ3iz0yCUMfom8DOh9IrT8Q== 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=1778785512; 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=6BxkH8yyHsJBlSglF/6hP7gVHcO1Bk6K7i6tBigN/Jk=; b=l2LUTEPKe0ydJWFjI/NH5Xo8k7E1NBw6YIUTjaGbrf/kl6nbQEopvzEgATcDMwmutqthtg yMIWGiSqWxhk6NJCZffB7XNBL78N25qWHvzw9G6NizUq9Ss3DcNtEPYMzi7w70HzB9ABON YPOTIRSTqSiUoCIvbdxQFyg64MYEpedlGyr0HY+5rXbMWRRhbBUUQAPiaZiWm90V1oSO9h P+rCrDDrI1czn6Rd7u5VAOdsIxX6UBjmlZU0v4ZUnUQXZO2PD4m8pktVf3dw3fmEVK1d2Q MaaGqy2SZ5Ryw2L46E0W6f3Bj6XkMIw+J7TZcZUaEbWRZYMev7YsvA0F8uhhgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsh14zJzr1h for ; Thu, 14 May 2026 19:05:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2555b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:05:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alan Somers From: Colin Percival Subject: git: 39fcfcc64bba - releng/15.1 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 39fcfcc64bbae6ff8792c8598c6147e3c63b60c1 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:05:12 +0000 Message-Id: <6a061ce8.2555b.4afcf4e8@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=39fcfcc64bbae6ff8792c8598c6147e3c63b60c1 commit 39fcfcc64bbae6ff8792c8598c6147e3c63b60c1 Author: Alan Somers AuthorDate: 2026-04-27 23:46:53 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:04:38 +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. Approved by: re (cperciva) PR: 294833 Sponsored by: ConnectWise Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D56675 (cherry picked from commit 1d24638d3e8875e4b99a4b5e39f4241e37221b3d) (cherry picked from commit 3298d82ea34059354dc1ff1a60d8b7d3e495c2cd) --- 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. */