From nobody Thu May 28 05:05:36 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 4gQvZS32Cnz6f3xq for ; Thu, 28 May 2026 05:05:36 +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 4gQvZS1Yprz3P5Y for ; Thu, 28 May 2026 05:05:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779944736; 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=0J9xnRtRYCmjjRuWJhafoyeXRF1o8f/5xehrmj78NoY=; b=wa+jWVUdvtcwRWpGoA8m+RE4Sznn/F9fwEZUFLqu9Qiwqwq5gKLswC9mYHxEwVP/a93QMt w+DNzE4rJrJWoFdJDjFG+mHkvzlb5NyVST9cv30kbddARbM6UDKYTzs3lSSN56xsPmP++T dLdubSD/YAPOx/o1fI9vQd5k03wtOf38A62H1Rih3fJr9zGjpV3m8Kp8D115GfcpBgEOwb xWy8s9MYMBzAKmR/jgycsRTUtwEL94p7ULl8qylut9QmqjwQjRjz05i+sPE/iNtTagjz+0 8+AurTtXG5lxYQFmDSSQrm77gJkD4d902BfZk16csgjsSk+aZCySQKegP30QNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779944736; a=rsa-sha256; cv=none; b=oEAC9oqPJpsCyXXuG/S4l3q+49+utDi9GdFnC7HwhQ+i3jtxeT5EmZtFMHVt9b7hpiUMqL ZdZMkr5dS3S4GnoyHmk7AfypAWICcug+YufkYkzhztqn0QC2u6Dj98yc0Fm7BE3mLuF+Hi /J5uzYD+5ZeGnjF1ovkPHiwn9CkzuuXI4R0yfgLc5Zvh0X+mYuWgo41WWd+IseHgzqRBGZ ZfnHlYNzm/yncztc2nk2GoxV0sCadn/cTzaoA0aA999lKF+86hjh8crlPG8AR5+CFKFson soTa78YMaWZznjLWg07I5s11L4Zsgwit2IxVZguo1AM6y5tXw9ZJaIHLWTTwAQ== 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=1779944736; 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=0J9xnRtRYCmjjRuWJhafoyeXRF1o8f/5xehrmj78NoY=; b=QSRmH7oJ+/4pIaIB1WAeIqDmAGMf4cgNdsSIXOsQTNjBpBKGz3DwVHuXPmPhBCJr7qtU8o ATzRwNnw9fdEW30KhD7Vz9Sk0EDUN6GALV4LRvAxiDH3FwmTzm3dsGk9oE8mR8EL3Zpl+n FFIeBrKrLpVHZ8is1CDmRxZ3MtIFzUgp+yFm1QRCkFju5NH+aGllYUCVy70nOiBMSIyRfW IdERm7OQRytSxEt+38SRjyfIM3R/AdI+QoPSd2IRIoVNK93OSkbEy1Yi9MEwSsfeABYLRm pe9mPtPbjmBMY9yfIrR3GWES4JmEozFYKyDtv/0PhKflDhtljoiiQFb6EZHiIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQvZS1566zXmp for ; Thu, 28 May 2026 05:05:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3da74 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 28 May 2026 05:05:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: d62e8c5c6fdc - main - inpcb: update inpcb multipath routing information only on success 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: d62e8c5c6fdc9e3b006bf126e1fb863e8bdd6c51 Auto-Submitted: auto-generated Date: Thu, 28 May 2026 05:05:36 +0000 Message-Id: <6a17cd20.3da74.17ec6fb1@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=d62e8c5c6fdc9e3b006bf126e1fb863e8bdd6c51 commit d62e8c5c6fdc9e3b006bf126e1fb863e8bdd6c51 Author: Gleb Smirnoff AuthorDate: 2026-05-26 16:02:06 +0000 Commit: Gleb Smirnoff CommitDate: 2026-05-28 04:46:38 +0000 inpcb: update inpcb multipath routing information only on success This is very similar to IPv4 change 24e5c2ee2a18. Don't modify inpcb until we are sure connect(2) will be successful. Fixes: 0c325f53f16731f608919a4489f96fbbe28d2344 --- sys/netinet6/in6_pcb.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index 8132899bb0d9..0cf6be2f9b33 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -465,15 +465,6 @@ in6_pcbconnect(struct inpcb *inp, struct sockaddr_in6 *sin6, struct ucred *cred, bzero(&laddr6, sizeof(laddr6)); laddr6.sin6_family = AF_INET6; - if (V_fib_hash_outbound) { - uint32_t hash_type, hash_val; - - hash_val = fib6_calc_software_hash(&inp->in6p_laddr, - &sin6->sin6_addr, 0, sin6->sin6_port, - inp->inp_socket->so_proto->pr_protocol, &hash_type); - inp->inp_flowid = hash_val; - inp->inp_flowtype = hash_type; - } /* * Call inner routine, to assign local interface address. * in6_pcbladdr() may automatically fill in sin6_scope_id. @@ -520,6 +511,16 @@ in6_pcbconnect(struct inpcb *inp, struct sockaddr_in6 *sin6, struct ucred *cred, in_pcbrehash(inp); INP_HASH_WUNLOCK(pcbinfo); + if (V_fib_hash_outbound) { + uint32_t hash_type, hash_val; + + hash_val = fib6_calc_software_hash(&inp->in6p_laddr, + &sin6->sin6_addr, 0, sin6->sin6_port, + inp->inp_socket->so_proto->pr_protocol, &hash_type); + inp->inp_flowid = hash_val; + inp->inp_flowtype = hash_type; + } + return (0); }