From nobody Tue Jul 7 16:28:26 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 4gvmqt5RBZz6k62Q for ; Tue, 07 Jul 2026 16:28:26 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gvmqt4x20z40s4 for ; Tue, 07 Jul 2026 16:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783441706; 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=qfn9FCn8CN9QHR4j/NfBWQpmoyZBbyZ6YldgGUDPono=; b=tnE/qXkORtuPKQhD7FA189ivD6lrKaMXhglxb/BCOAH5eNAtJYs5Hhf/NACGLTi4dAKamZ Y6FJfNNIk/I2zq/QBPMjBAtkBZLJN+iXuyYIH/zfLeZoMW70zRplw8UCTXX495OVACM7uG YsmqVI2COUmWscON4tnBi3IayENT6Yp8ggZ7mgcdY893A9gSOGnTdXyAfvQGiEJIYPhf6D NSjm1AVwAAhOR/iij8zzTlOD8yciFffy2gvFpVZhBczv5bPhAF+2aZs/ne7H2s26QBUb19 XYjFo/S44qLD3wqdSPQOd4rAF0gfycR1pNT0wQ40SEoTMBHkIhWgnJ/sidNd0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783441706; a=rsa-sha256; cv=none; b=I15K7ITjJ155nUQm9w+tvsZ1NId5xQDtrG54QKUjdhnjMpWxScJEmtPpTQJpprv2taEsXZ jR52UTIHdDI+PEGwTvSmNqIjCtymGHuebPr3jzc6B/i6q1UGIp0YjFjUlhdk5tEhEEG4HQ Vfri4g69ART2gnKh8taNcqhmLuBOsIe9pGnSR1xnvEByEw3Pxif4ptr9JWsv7iX7Z2WX/u ZnqS+3+J8esjcdmjBfJCquO2pAdJ4jQS4zO4ZWEs4PKcsu9d6xjqwiKdfqWtC9qJOfqrgI ZBZDEtysGDHJNB8vipoAlRSpsjzYTMoqvMM5Ogi1hT6LB+n0jBuMq0Emv2VPbg== 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=1783441706; 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=qfn9FCn8CN9QHR4j/NfBWQpmoyZBbyZ6YldgGUDPono=; b=wHhmJh2e8iegI5fTkyUDfL+VCRQ8gwEcWu/R30JpItnATw/8UKlsgHpkoWW66eO/VpS8By iM75XrSSjMXw3ydbxqyBqGGWKPXCD1PvxsCIilJTznEb6ZIYpm4ZMjeIxRL2UFidgEY6ba YLi1fGjqJxh7jY6PnWGFAGNbWgskT/7gAUiTnVL1iRyz78sS+ByBNmyqy6XAqNKIvqDRql 60ERjcWKJta0GXLN2QzsQgbiXyYkP4hRul5s3v/Qswek8tmtJJdbUratdzRPMoOvJVJTib 3vVkRJris9R+DIwpi0Lb0gTTwpXB2EK2Ig9ofwbeslBtGwkscZfQKxNugLjTEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gvmqt3qqSzjnB for ; Tue, 07 Jul 2026 16:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25a32 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Jul 2026 16:28:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 3fdb1b6f10b3 - main - netinet6: further refactor in6_pcbconnect() 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3fdb1b6f10b33f9ac62a80d75898a89c153445fc Auto-Submitted: auto-generated Date: Tue, 07 Jul 2026 16:28:26 +0000 Message-Id: <6a4d292a.25a32.400ad208@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=3fdb1b6f10b33f9ac62a80d75898a89c153445fc commit 3fdb1b6f10b33f9ac62a80d75898a89c153445fc Author: Gleb Smirnoff AuthorDate: 2026-07-07 16:27:57 +0000 Commit: Gleb Smirnoff CommitDate: 2026-07-07 16:27:57 +0000 netinet6: further refactor in6_pcbconnect() A mistake from 90ea8e89d9b7 is that in6_pcblookup_internal() was skipped for an inpcb that had unspecified local address. This is incorrect, as such inpcb could have already have a port set, and in_pcb_lport_dest() shall not be called on such inpcb. That could lead to creation of an alised connection in the database. This makes the function almost identical to in_pcbconnect(). While here, fix minor bug of missing INP_ANONPORT. This flag has no use in kernel, but affects netstat(1) output in certain mode. Fixes: 90ea8e89d9b751e8b5ae90ef3397883b035788e5 Reviewed by: pouria Differential Revision: https://reviews.freebsd.org/D57987 --- sys/netinet6/in6_pcb.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index 971f05838ce2..1b55a3425e59 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -450,8 +450,9 @@ in6_pcbconnect(struct inpcb *inp, struct sockaddr_in6 *sin6, struct ucred *cred, bool sas_required) { struct inpcbinfo *pcbinfo = inp->inp_pcbinfo; - struct sockaddr_in6 laddr6; + struct sockaddr_in6 laddr6 = { .sin6_family = AF_INET6 }; int error; + bool anonport; NET_EPOCH_ASSERT(); INP_WLOCK_ASSERT(inp); @@ -462,8 +463,7 @@ in6_pcbconnect(struct inpcb *inp, struct sockaddr_in6 *sin6, struct ucred *cred, KASSERT(IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_faddr), ("%s: inp is already connected", __func__)); - bzero(&laddr6, sizeof(laddr6)); - laddr6.sin6_family = AF_INET6; + anonport = (inp->inp_lport == 0); INP_HASH_WLOCK(pcbinfo); if (IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr)) { @@ -477,25 +477,27 @@ in6_pcbconnect(struct inpcb *inp, struct sockaddr_in6 *sin6, struct ucred *cred, INP_HASH_WUNLOCK(pcbinfo); return (error); } - if (inp->inp_lport == 0) { - error = in_pcb_lport_dest(inp, - (struct sockaddr *) &laddr6, &inp->inp_lport, - (struct sockaddr *) sin6, sin6->sin6_port, cred, - INPLOOKUP_WILDCARD); - if (__predict_false(error)) { - INP_HASH_WUNLOCK(pcbinfo); - return (error); - } + } else + laddr6.sin6_addr = inp->in6p_laddr; + + if (anonport) { + error = in_pcb_lport_dest(inp, (struct sockaddr *) &laddr6, + &inp->inp_lport, (struct sockaddr *) sin6, sin6->sin6_port, + cred, INPLOOKUP_WILDCARD); + if (__predict_false(error)) { + INP_HASH_WUNLOCK(pcbinfo); + return (error); } - inp->in6p_laddr = laddr6.sin6_addr; } else if (in6_pcblookup_internal(pcbinfo, &sin6->sin6_addr, - sin6->sin6_port, &inp->in6p_laddr, inp->inp_lport, 0, + sin6->sin6_port, &laddr6.sin6_addr, inp->inp_lport, 0, M_NODOM, RT_ALL_FIBS) != NULL) { INP_HASH_WUNLOCK(pcbinfo); return (EADDRINUSE); } + MPASS(inp->inp_lport != 0); - MPASS(!IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr)); + MPASS(!IN6_IS_ADDR_UNSPECIFIED(&laddr6.sin6_addr)); + inp->in6p_laddr = laddr6.sin6_addr; inp->in6p_faddr = sin6->sin6_addr; inp->inp_fport = sin6->sin6_port; /* update flowinfo - draft-itojun-ipv6-flowlabel-api-00 */ @@ -520,6 +522,8 @@ in6_pcbconnect(struct inpcb *inp, struct sockaddr_in6 *sin6, struct ucred *cred, inp->inp_flowid = hash_val; inp->inp_flowtype = hash_type; } + if (anonport) + inp->inp_flags |= INP_ANONPORT; return (0); }