From nobody Thu May 21 21:21:55 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 4gM1ZD6W5lz6f01r for ; Thu, 21 May 2026 21:21:56 +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 4gM1ZC264sz3DJ2 for ; Thu, 21 May 2026 21:21:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779398515; 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=IPtju7AdqsqVmmPDjsl0JKIlFXRSv506uOD9m2Qr8x4=; b=gUd4C5q1LVXUSLNumFdPO4fZcfQFq8s9+Gkr2tU4juLAyqsNDXL13j6f5nsMJciEeD6V1W ANJV9cIR2Yo69DIqb5iGNKFUoo/QWNsWNXkz/CqTOZBXLyGQkaVhr/TPui7S6nZfgFNiZj GusBy7MTJnJok7THXejxj2or8LbqSHtSeZupncTQESyzBzqADlJeYXUf6VI7saFC/pElfg qTkOEyIGUnoChVJS/zkR6pP6snGOkwSY/Hf01oqwwzKwaEp2x9mTCT1o/dk0J1OpIIuJF+ QnzD/WBu3C/IabS0hTJyCFGkhMkawmN58/WZr8p10Gsn2dZcLsQxB8y/M0ANHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779398515; a=rsa-sha256; cv=none; b=dSHzKzPOVxl5Q9+I0P+OpM2NlBP2ETHCDcXI7NoXcEw0Z3HhhWO7uZEhA49MPIZzG+geUg dkGu+Ko1ZCv89SggpxglaW8MFwuDw4EQb5XntYL7R7ak1RQlKtgxYbmw7hYbX9bFzPaW6P TdMwUHhO/BjxDsUqy5Fx2LMVVVhEk2ZvhuffhxK0d900guDZIs2GUhCrWjbGG/zsEneNoi hxtkxF4qgWcgc7RiiUQ4cBcvT+bAewLQcsACX8gx1zfw9yx/uCYBKbajbnlNwWfxNjLoXL 6WTqpCoEQhFxE0aXcr/E5w2aZTB6QKsEM1qpduDXTmN/dwP/u+gKMWm98qpPvg== 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=1779398515; 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=IPtju7AdqsqVmmPDjsl0JKIlFXRSv506uOD9m2Qr8x4=; b=Y7o+rx3rsaDGexJ9Dt4AVD0nfL7ZqQqQ8y4eZyAE6hX2s/SvDyfoYxYrU00rRZ3sCU1Kg8 A8fxJTgUFPXC1Hoe7dNq11IZB6TAImgsXcwOxwvt9khQ1Lsayj3Dt/0jZ6w3bo7pPqqfX3 EmB8qtbbS57VrMLwqgEA28CdYEYE7DneyrHb5sEpREIWMbqpN5+wIxgrlTgdY3ba1OY5ta SV46RhI+PYHdNnCTNyADi16FVnky6E3UcSLcCx21fatSU0wLi5tUZpJwUJck59YVcxELLa Svf7zS0zgPM/Z6tjnEzAZu5sK05GIrwaXV0cKiDOv23b7zn1azxdkzz6lFGrMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gM1ZC1fCSzqQw for ; Thu, 21 May 2026 21:21:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bdfe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 21 May 2026 21:21:55 +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: 4eb969321cef - releng/15.1 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 4eb969321cefdc878de8be81abd30d09732db7c9 Auto-Submitted: auto-generated Date: Thu, 21 May 2026 21:21:55 +0000 Message-Id: <6a0f7773.1bdfe.70f2e9cc@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=4eb969321cefdc878de8be81abd30d09732db7c9 commit 4eb969321cefdc878de8be81abd30d09732db7c9 Author: Alan Somers AuthorDate: 2026-05-16 18:03:49 +0000 Commit: Colin Percival CommitDate: 2026-05-21 21:21:00 +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. Approved by: re (cperciva) 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) (cherry picked from commit 57fb48f8e2fca5f069e9bc3cf080608f602919a9) --- 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;