From nobody Wed May 20 01:47:05 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 4gKvYB21BHz6dvDX for ; Wed, 20 May 2026 01:47:10 +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 4gKvYB1KDmz3CDj for ; Wed, 20 May 2026 01:47:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779241630; 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=YDwJyZbVrf2ORQu8CqZCWUIZhk2hIiJKp0gM4Mdg+7E=; b=dBOcmXDEeZv+QghgAiPKuuwWkxtP0pTa3hlNTMgScHkbMiOx+H+ihwYAeBgJobeKXeqwvh bl0bgXPc9w0d2fBuB9bVh6Hc1gdSTYDEEXVC7OCKczjKdvGjcJvl++1zt1JsBVLxH6uWDZ JdKuDPNQxAuWrmMgQspoOi8G081rDfjspEO/IOjyccHsps2/zQZpkdh8kvFSyQKJBaBp2m ixqYTyJyrkZByrkzVWX+xg2oJ02koaWqGWGqR17PMUcgCgMjXhNov3mY58ZtD2uTq9PGGF 2ACwr+kSnlHe/OiS5V3+TnrtX7g0C/r4UyIJmCiIYo/cDvUIGnb5tlBaVtwmnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779241630; a=rsa-sha256; cv=none; b=ENFK0lPZs5wpaq29fGtxMMejrRAzMrNLo22RL2tw6Sj3clOOBpe96ELEh8p1siZnAUlZ3d Pk84odtAukq1QGwXSt9eVxDCAZXVJHAHeOhUxsuOlBcmLot6KY6mSgezBuqFxFN1KISinS CVHDhHb29uA2EkIvOtGQmpYgq3IKYZ4ASOE5SCBZLIfl/9LgnCB/e9mbgNzFSOv+LUNK6F +vj4sWb+LJlNKneSOereAbmx2CjwD7QugEVoub3RFK37meWdL9gw+Vs2fId4T48INRcBFZ LXWhj1QRLk2ub2oGtPAdPflJC4FM+JspM7pn4TN3IWvKHWMftelUB2MbupLpFA== 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=1779241630; 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=YDwJyZbVrf2ORQu8CqZCWUIZhk2hIiJKp0gM4Mdg+7E=; b=JJ/RxDnLLAPmfNhnR/r71FtT0sMUr71F+aVnPhyYlIZxp4P6I71uD6ca22ps/QTFvPeDRH zn6NM+uN8YP7TdKaAWVGzkd4Dy6q9u2Q21B4Gsl0u/RxaFus1aTeGAnyOhv1uk9/4LrSWo oNUrJNqQcYQXsIo8+Ljh5kMqfk5FvxsDdbXVjvGCmyct14/MmG0oy4nz9ZfU5s/WGyM/Dq 4jqpGX7TuRQVOsocOSi7Gbv/tlyZ3arxiV/MDvzvw3bN2SdJhehQg29zwNPvmor0WI1lP9 3Om8PJHqcapz5/FEEpA/hZsAVwai/lGxgXYvGIMjiXwa0B/od6ECp4WTo7Suuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gKvYB0tKnzgqH for ; Wed, 20 May 2026 01:47:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 368a1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 20 May 2026 01:47:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 57fb48f8e2fc - stable/15 - linuxulator: fix SO_PEERCRED emulation after 1d24638d3e8 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: 57fb48f8e2fca5f069e9bc3cf080608f602919a9 Auto-Submitted: auto-generated Date: Wed, 20 May 2026 01:47:05 +0000 Message-Id: <6a0d1299.368a1.74298d9@gitrepo.freebsd.org> The branch stable/15 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=57fb48f8e2fca5f069e9bc3cf080608f602919a9 commit 57fb48f8e2fca5f069e9bc3cf080608f602919a9 Author: Alan Somers AuthorDate: 2026-05-16 18:03:49 +0000 Commit: Alan Somers CommitDate: 2026-05-20 01:28:33 +0000 linuxulator: fix SO_PEERCRED emulation after 1d24638d3e8 For Linux binaries, sopt->sopt_td may be null. And there's also no need to check it, since struct l_ucred has the same layout on 32-bit systems as on 64-bit ones. PR: 295333 Reported by: Miguel Gomes Fixes: 1d24638d3e8 ("Fix LOCAL_PEERCRED in 32-bit compat mode") Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D57032 (cherry picked from commit 4cee16d471d47f4673e4d2c66f7a96d4e6d86ee9) --- sys/kern/uipc_usrreq.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 8e8261c9644e..90c13f7e17c4 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -2759,7 +2759,9 @@ uipc_ctloutput(struct socket *so, struct sockopt *sopt) if (error != 0) break; #ifdef COMPAT_FREEBSD32 - if (SV_PROC_FLAG(sopt->sopt_td->td_proc, SV_ILP32)) { + if (sopt->sopt_td && + SV_PROC_FLAG(sopt->sopt_td->td_proc, SV_ILP32)) + { struct xucred32 xu32 = {}; int i;