From nobody Fri Dec 3 20:32:44 2021 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 41D6718A87FB; Fri, 3 Dec 2021 20:32:45 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J5Pdn03jNz4l3f; Fri, 3 Dec 2021 20:32:45 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 D60EF178E1; Fri, 3 Dec 2021 20:32:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B3KWieQ038002; Fri, 3 Dec 2021 20:32:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B3KWif8038001; Fri, 3 Dec 2021 20:32:44 GMT (envelope-from git) Date: Fri, 3 Dec 2021 20:32:44 GMT Message-Id: <202112032032.1B3KWif8038001@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: 13e3f3349f42 - main - in_pcb: fix TCP local ephemeral port accounting 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 13e3f3349f42d30bd320b8b5cabecb4d66360c92 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638563565; 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=bO2rAGOaN+pOm4kzGjOzJmQDqeBROMR7JK72S91JrmY=; b=PDLurs8wpbRcdHUxNQwRumCxPyQwQg8XpNKN99F1YWKVj82aEplUOjiaUbENJX1po1jCr0 sfTYWRkJaLoOM7QBLCoH7pTY7RyXsABP03R8t0XcdR0TkQWiJ9/vXNL+1Qd1pBlk3mY+gG Gg2xQBTCAm7wHp/dee1zbujsQS8mK0YqqbFBkE/82oeNBqgD63TRgt4RJgTdWBlBoM79mF KCRHFTuPKgV59es94ehzliys0oi+ugmPNAhrCjHO9cYbxPJ2mTvxcKkRD3dnT/UUZb470X 6yhDVkyy3683pyRuO3Ruk5PMyDWKlaQWoSgcyRqYzX4FcL41x6C/OSWI9t7O6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638563565; a=rsa-sha256; cv=none; b=O7sDfbNJ6R9nN2buRqL9m10liIxjdZOZGZIq4y++6yVhOh2w4eS7TME7HCnImqmGIKgfwj 5TiiRWbOimZffEiencO8o0y3cJ0EEHEbZM5C40djDJxmCqaZd1qOwC9Xsfnh+I2cur3CXx oV9JHbOFziNsnwsoOJgGXVvgfqnaHn7d1v7RujeXWpjawBtQbSNpyQ30tRK9UEfzBlsjgN Em0XXO+8FJnmFvZVH8G980UiveFedLkj58f7IQgLOCLd525M6iV6Z6j9UdGWAVltIXmgVj FXhnMEeMhAscgsLNlGjTGyeHrG/Fzc371sA/N6lH1pHBQH9Pgk3ZAHjKWwHl1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=13e3f3349f42d30bd320b8b5cabecb4d66360c92 commit 13e3f3349f42d30bd320b8b5cabecb4d66360c92 Author: Peter Lei AuthorDate: 2021-12-03 20:30:21 +0000 Commit: Gleb Smirnoff CommitDate: 2021-12-03 20:30:21 +0000 in_pcb: fix TCP local ephemeral port accounting Fix logic error causing UDP(-Lite) local ephemeral port bindings to count against the TCP allocation counter, potentially causing TCP to go from random to sequential port allocation mode prematurely. --- sys/netinet/in_pcb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 081d204f559c..a894163ed5a6 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -748,7 +748,7 @@ in_pcb_lport_dest(struct inpcb *inp, struct sockaddr *lsa, u_short *lportp, if (first == last) dorandom = 0; /* Make sure to not include UDP(-Lite) packets in the count. */ - if (pcbinfo != &V_udbinfo || pcbinfo != &V_ulitecbinfo) + if (pcbinfo != &V_udbinfo && pcbinfo != &V_ulitecbinfo) V_ipport_tcpallocs++; /* * Instead of having two loops further down counting up or down