From nobody Sun May 17 12:50:32 2026 X-Original-To: dev-commits-src-main@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 4gJLQ06wlHz6fHs1 for ; Sun, 17 May 2026 12:50:32 +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 4gJLQ06R2rz3FrB for ; Sun, 17 May 2026 12:50:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779022232; 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=oqmMo46l3oFFvbwKvfyK0ieXs3TP+yz+NPpjHUBi9kk=; b=CAKzQ6e5udy+xL8u+ZI+odjQ8ysJOdiRMwmW0JcaNLGcbVDZFy+oPN4VC8FGEw9htMAtJL ygBgrR8GHY+2i4yHYjqz823UtFdpDYTSPlTjGPottea0EBZUU9UeBkilOXsL+NnqOlZWxd vdzfkISN0fAw1092w/cfn4I6Rb9FjKKW9U7NofV0ncONly0sZmAHcKnq2JezVy6h2iM+Mt bYL38CPYwpp5zqsT9ktiD5uzmSSxLBFDqPgnGjWwb6G2rDGVp3cY/gI8am4gmG8vHd9HWE oTYSvRrCPy7XAMo8HMghrQyZJmkKQJkMWE29Ul7WEpiB53UwwJfPnM6lVt1QBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779022232; a=rsa-sha256; cv=none; b=YOQjgZjQrIViudSI2LfNLXwEEl8ofodhTypm64u03LtDBiZlipgLFLXN/m4m6CVp6BSmlk INK6FdvGvMwxleAx9X7KZzOo7Q7RU2y7Sqt8uo74txxEbIFw72lAq3rhoLXNmOUsJCKwhX /iwMtXW2hapA6I83h5tdcgk7+Oa8p3UNq+GkEaFa3vjH+Gunlp5Z4mPEZwQi9F5uqIUbJz c4NHM5t4zTYiuzpLw07ryWdG6c5WIMmGDdblkgKWRcOPNaXc/p/qqwN5kUWGaZG7wmTQEL nBDTxlLgkYPc4V23qXA/igIkAELM2oG9eTYqlqFgSAvxd3GfHOz/mpTnAQ8XWw== 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=1779022232; 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=oqmMo46l3oFFvbwKvfyK0ieXs3TP+yz+NPpjHUBi9kk=; b=GmzU8yHaquMk1/13lT1IecnPAUaFk9IjjSZSeNCj3aDqY1zMRSWkdLlYua/HSWoFZ7eNMz bb5hiArY3VFmLFAXgFUUI9Sk8pkE9qQve6KXmUwaO97dRHNkLc2iCZhPdMl9ZG5O2QLt3v to1O3wkCV0+n+z4ne4OJF06FoL88MpJlpQgZQVbbceAmgkMnR+w5bSkKDhWmnDZYgTNCN7 iuWSIFUg284nAeZXJhGexKUgb4fJB3B5W6RBzjVjtYWpR+kg4jMqWOJR1gHWZyPcSUEFDb 8ynukLrF2/zw371brC132eUOK/DqaUzSgBmDj/nc/HCUY1H0UHyQuRoErjlP3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJLQ05zjvzj68 for ; Sun, 17 May 2026 12:50:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 301f4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 12:50:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 4cee16d471d4 - main - linuxulator: fix SO_PEERCRED emulation after 1d24638d3e8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 4cee16d471d47f4673e4d2c66f7a96d4e6d86ee9 Auto-Submitted: auto-generated Date: Sun, 17 May 2026 12:50:32 +0000 Message-Id: <6a09b998.301f4.a5dedec@gitrepo.freebsd.org> The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=4cee16d471d47f4673e4d2c66f7a96d4e6d86ee9 commit 4cee16d471d47f4673e4d2c66f7a96d4e6d86ee9 Author: Alan Somers AuthorDate: 2026-05-16 18:03:49 +0000 Commit: Alan Somers CommitDate: 2026-05-17 12:49:23 +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") MFC after: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D57032 --- 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 2508f7edd1c5..a5607e66117c 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -2756,7 +2756,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;