From nobody Thu May 07 21:07:07 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 4gBPvh6b7Mz6bymB for ; Thu, 07 May 2026 21:07: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 4gBPvh65bGz3VSJ for ; Thu, 07 May 2026 21:07:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778188032; 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=zbQDsj+h8XikRGaixweOV9biTwP7GrRZqzzx2TFUEzs=; b=SD1UfPlE7t8iocBEqvkGADFzL2INpDspzrOTD0wr4WKCtre3tMuyoNUg6C2A972lOdtp5Y 9qmKWz9v7e2iUr93UCY9+cFx1pcky/q/TJmUMoc5RGrjTvL2pbS1k+W3SexDaQz74eOge7 BvYw9IscSDkww7XQnPff8QXOe1CUxpQTPex43QCFmkfJWAiPBina7Ohh0HJCZ+dc4TVoJz 2XZ+HG2CLeyPNUA+AUv9qlSZkfcQauO5kZITgwDiG5KkpvMZMsqr0kYyLqW2J/g++2tvAU uqIRsaF/tTAoRhaPqW598ZQPMaUM2usOtcGw/ESZ0lPzUSyJ7y/WG+nixV2CvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778188032; a=rsa-sha256; cv=none; b=dYdTCFtYKSkpT2ca0zTdAAZmZThpbs2uOKpdRtgdZTEUVvNcMvTXKJLHClPSigAgQO8S6F Z9SanNxSYcd6uVnsaIFZx2543w6jyZF4bn6AltoU5FfkJiGgnKuYxPlgwqCxEXU2a/amS4 WynPYRdex90YNL6ztxdujBQSkCldEIHpkgBjCxTBDO9vF3OG3HgBQfugaP7fQGWy3bc6QS gqIZbWCL7pClFcGQ/sKajR3M8Oyuq/HUGOAuwhSGUm8mLAG6jaCa8/DHMN80UYv4dbC6z8 iICgu1jEufcBkZ1LgnQt4nfS7m4FK4km8UVBf1h6Zsx1QlaDzrHrpmhq4VO5xg== 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=1778188032; 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=zbQDsj+h8XikRGaixweOV9biTwP7GrRZqzzx2TFUEzs=; b=X9jmuNekB34X9PPc8cB7vcrcmKta68NWwl+0Thvq1/rOnbJboqZb7/uB1JbruOJJ85Fk4T Jm3v4lwkyc2S1kfUI2ZPlw0njXNfEAqgrejmje/Y33JH1SqeLW0I1lzTwXDyVKa7CEl9og wDDOgsEMpk9Jj9L+AlI2Xr8h6HY6SVh8qhlUKFjJiQLaeP4yox9edyAWStdcVSSzZH4JCu epaeLj2LK14Okpv6h9J8GpZDHnY9KwB6EL3KxZYFUxOu+ayZbVHtOMyrgcCjXtL0F4k4Li y+zlNJxZZJURoyfO+tPInx/mWl1dO1S4LzhrMWF2g/m5ehtQxPijDELz6H/7dQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBPvh5QSWzk0G for ; Thu, 07 May 2026 21:07:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24e0d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 21:07:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 1d24638d3e88 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 1d24638d3e8875e4b99a4b5e39f4241e37221b3d Auto-Submitted: auto-generated Date: Thu, 07 May 2026 21:07:07 +0000 Message-Id: <69fcfefb.24e0d.5cdbd5a5@gitrepo.freebsd.org> The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=1d24638d3e8875e4b99a4b5e39f4241e37221b3d commit 1d24638d3e8875e4b99a4b5e39f4241e37221b3d Author: Alan Somers AuthorDate: 2026-04-27 23:46:53 +0000 Commit: Alan Somers CommitDate: 2026-05-07 20:52:35 +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 MFC after: 1 week Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D56675 --- 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 8ff9822ee9eb..2508f7edd1c5 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -83,6 +83,7 @@ #include #include #include +#include #include #include #include @@ -2752,8 +2753,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. */