From nobody Fri Mar 7 07:00:56 2025 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 4Z8HHs62Nrzt5hB; Fri, 07 Mar 2025 07:00:57 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z8HHr6cwvz3hFp; Fri, 07 Mar 2025 07:00:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741330857; 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=w0NOpNUPNGwOP09Eclxysy/DgGwgM07zD2EX1hufPNA=; b=dKH6BKEMUVSpE802YCyPQsXyliobXt/pSX7WGRes7CVC9rvvC1s0AgBbPherrYYF+gFaJT BT9KvIIWGKxFJCQqAjtXHzMXqFLEG1YLyiUu1fE3mSv5nU3HjVeduOoweVZBbWFuCKVXV/ PDQtdZ4NbASHm4KbDCXJGKoC/IuVCN+oWR2r/MxHUssoTA7qFQO25BffRNaoTuZWm6j6A4 cyGdP9Boe68jbk3kaASSadRy5mqqLU/1bskwXKKWAIKaN4z7a3j/0wh+wepCQHAgdpeo+h wf3pCOlX2FxyEZIQ0EyQU88nOBDYjzpz1jsyEkbPhrKE6bKoRczzJTrY+WP7og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741330857; a=rsa-sha256; cv=none; b=DMRywymJNkbZBwsiDNjWGk7H/fazEADDCUrT+op15EohRIqzwJqsiIyIlFaE4Pr8VWQmIT LPdOh1rdvbVAaMcL5veVICf+wJ3QpKsJhm+3rm3s15ZGHRTlfZCkzacd8rVi2U3mEGWSKt em6/zMIy6E36ewbPVxGmLWgeBz3HPbccP+agvkCWm5Tx27MBofUpD1hxbqtsKG0HfTbDz6 lOOgx69WhPq9sMnJC9oQgXmk7QLKIrayLMZmn5Yi69s1bTyXE1xg4e1y4N9Y/iw63e4Fma O5S1s2i12Ztr3YPBPfmkfmSqskQI44an1EWnq7mVqS9L73Hrr3UApdLTeU5mHA== 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=1741330857; 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=w0NOpNUPNGwOP09Eclxysy/DgGwgM07zD2EX1hufPNA=; b=ErqadsyEPMXrrF4FUPi4blgiEG8fM5L6JFT02p3etnoSZImgfkLuuSeESPA/5Pnnv7dVSh 7allokYwHhWEgjYTXuyKZAi/H/VSwXz6tOOWlM8KGde6I0Z5rILQme/9iRRaCabp5lhkIR PLXG9OiH581qYKiTHPx7apYF/7ByYk4VgjFvKD5z/ilIpagu9KRbeBB9+Awrq7UldSCQwG xcOZsLXp9bXng0NKMBYb1PkDHTFhTqHnDpnFXRq/ItJXxcI1ImQLk5Hq55UtnrXhNHMdBW sDi4Y5hWlt2+CukRM0QYclMxXQ8wXsxX0BMkmeRiLihzilwkGf3ocChmsL7mlw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Z8HHr1zzVzB4H; Fri, 07 Mar 2025 07:00:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52770uhb062271; Fri, 7 Mar 2025 07:00:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52770uY6062258; Fri, 7 Mar 2025 07:00:56 GMT (envelope-from git) Date: Fri, 7 Mar 2025 07:00:56 GMT Message-Id: <202503070700.52770uY6062258@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 452187b61147 - main - inpcb: in_pcbinshash() now can't fail on connect(2) 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 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: 452187b611470a827215e9cd103a5616b8610662 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=452187b611470a827215e9cd103a5616b8610662 commit 452187b611470a827215e9cd103a5616b8610662 Author: Gleb Smirnoff AuthorDate: 2025-03-07 06:59:40 +0000 Commit: Gleb Smirnoff CommitDate: 2025-03-07 06:59:40 +0000 inpcb: in_pcbinshash() now can't fail on connect(2) Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D49152 --- sys/netinet/in_pcb.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 08097ea8c1b9..8a99297f3818 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -1178,27 +1178,19 @@ in_pcbconnect(struct inpcb *inp, struct sockaddr_in *sin, struct ucred *cred) else lport = inp->inp_lport; + MPASS(!in_nullhost(inp->inp_laddr) || inp->inp_lport != 0 || + !(inp->inp_flags & INP_INHASHLIST)); + inp->inp_faddr = faddr; inp->inp_fport = sin->sin_port; + inp->inp_laddr = laddr; + inp->inp_lport = lport; - /* Do the initial binding of the local address if required. */ - if (inp->inp_laddr.s_addr == INADDR_ANY && inp->inp_lport == 0) { - inp->inp_lport = lport; - inp->inp_laddr = laddr; - if (in_pcbinshash(inp) != 0) { - inp->inp_laddr.s_addr = inp->inp_faddr.s_addr = - INADDR_ANY; - inp->inp_lport = inp->inp_fport = 0; - return (EAGAIN); - } - } else { - inp->inp_lport = lport; - inp->inp_laddr = laddr; - if ((inp->inp_flags & INP_INHASHLIST) != 0) - in_pcbrehash(inp); - else - in_pcbinshash(inp); - } + if ((inp->inp_flags & INP_INHASHLIST) == 0) { + error = in_pcbinshash(inp); + MPASS(error == 0); + } else + in_pcbrehash(inp); #ifdef ROUTE_MPATH if (CALC_FLOWID_OUTBOUND) { uint32_t hash_val, hash_type;