From nobody Fri Jan 12 15:55:30 2024 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 4TBR2V3c5lz574Mg; Fri, 12 Jan 2024 15:55:30 +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 4TBR2V2g2hz4Pd1; Fri, 12 Jan 2024 15:55:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705074930; 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=Bk9Rfyt4wZZ5u3wku8BR5p2gyFvP4iBtdl6Ihdln4MA=; b=WcP2Mlt25dz1e/piihwCj9MTFiqgWd19wXGcNpJWJk6ARQhGAWw/8OaUkls/hXNJcWkBoQ FirnG03loxnKHfqAsITJfxuWq1mKipi3HcCu9NwD3eRgnjHRPiY93rq30wcWPBueoTDM8I ddwsFcEIvaJrhPv0WAKKq/dcaUMP+4+YEQdZRFIuuGKcrhJpux9EJtD2adzwOrZICbBOX2 5K6Hb0D2r01AGpls/+Fm6FLlYkNVsEAyF59mPf/barlEQnLs9125H4iUfxv3WwrdnNPQ78 5FeP54f4Jg7w4P4d2HZRRxJVqWY5wPiYwrwpihV4rPT7uJZwUsZQD3oRbrzhYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705074930; 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=Bk9Rfyt4wZZ5u3wku8BR5p2gyFvP4iBtdl6Ihdln4MA=; b=cFkIVxqm4UuoUec3osFQrQgT88mXR9UJweNqHOfULUAFe1Wp4F0vJ1zFt51I+fAsSwMeiz FrATBxkWePRdgxrxVuaOaqfn/1psnbBD3xeQqGU6FVapXgi+HS+UY8hM2nta9pRtCP6/XN D56YR+5MlXdhwqw1FyLSnGwmwXiQb1L43FjqRyPx5eDI+fGRVy+LkFHizjp2T4S43dx+Ky NT3pZ60e4DTGDuRDWjzldn6PdNWcGSGia9YH40Ba5qR0fYsexU/hmZbsL42o/YxBwRubw0 cxKaB8mA5moq4QuFyVDGu0mlVr6Ih5cMlH9qSoBdN5CdkjGD3xwyg9E5jQPkbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705074930; a=rsa-sha256; cv=none; b=jiu4XiKUl+DI0IA+9xYvrp1KmpSi3a/WoiwvXSWBAsT0M7iYlK0X1BMyeUe+RuCjBeLh9K OXJ23NFeZbMEOM1TxOe/3mcGzmyM+fouzUGtLAoDIEYTi4aq19kgI5vKMKJe7sqS8rmC0D Fl5tj44tHSV8vq15Tm1Sm/sKDApawq98ascNPOpuTVTwdLVnEptgD9UjnOiIsY5AnflQAr lSPiIH0ihd6ZwbE6iqZwuraLaeFZdRmInOLPw+OZvs8vTr+Iua+Nv8jDVjdLkdGIbhPNM6 fXOefmAepc4zAjVsv83Q8Z0Ltul4AqOiVnIR4nYR3E4NLNfePXnrXuh089ejjg== 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 4TBR2V1jN3z17Zd; Fri, 12 Jan 2024 15:55:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40CFtUqi093454; Fri, 12 Jan 2024 15:55:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40CFtU03093450; Fri, 12 Jan 2024 15:55:30 GMT (envelope-from git) Date: Fri, 12 Jan 2024 15:55:30 GMT Message-Id: <202401121555.40CFtU03093450@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 6b019c30ace1 - stable/14 - tcpsso: fix when used without -i option 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6b019c30ace18b49822ca0869227e677c4ca8081 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6b019c30ace18b49822ca0869227e677c4ca8081 commit 6b019c30ace18b49822ca0869227e677c4ca8081 Author: Michael Tuexen AuthorDate: 2024-01-10 07:33:09 +0000 Commit: Michael Tuexen CommitDate: 2024-01-12 15:41:49 +0000 tcpsso: fix when used without -i option Since fdb987bebddf it is not possible anymore to use inp_next iterator for bound, but unconnected sockets. This applies to TCP listening sockets. Therefore the metioned commit broke tcpsso on listening sockets if the -i option was not used. Fix this by iterating through all endpoints instead of only through the bound, but unconnected ones. Reviewed by: markj Fixes: fdb987bebddf ("inpcb: Split PCB hash tables") Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D43353 (cherry picked from commit 13720136fbf951a7b472ce086c9cf2de702799ab) --- sys/netinet/in_pcb.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index b00d61eaecf7..95e162e60f53 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -2991,25 +2991,22 @@ sysctl_setsockopt(SYSCTL_HANDLER_ARGS, struct inpcbinfo *pcbinfo, htons(params->sop_inc.inc6_zoneid & 0xffff); } #endif - if (params->sop_inc.inc_lport != htons(0)) { - if (params->sop_inc.inc_fport == htons(0)) - inpi.hash = INP_PCBHASH_WILD(params->sop_inc.inc_lport, + if (params->sop_inc.inc_lport != htons(0) && + params->sop_inc.inc_fport != htons(0)) { +#ifdef INET6 + if (params->sop_inc.inc_flags & INC_ISIPV6) + inpi.hash = INP6_PCBHASH( + ¶ms->sop_inc.inc6_faddr, + params->sop_inc.inc_lport, + params->sop_inc.inc_fport, pcbinfo->ipi_hashmask); else -#ifdef INET6 - if (params->sop_inc.inc_flags & INC_ISIPV6) - inpi.hash = INP6_PCBHASH( - ¶ms->sop_inc.inc6_faddr, - params->sop_inc.inc_lport, - params->sop_inc.inc_fport, - pcbinfo->ipi_hashmask); - else #endif - inpi.hash = INP_PCBHASH( - ¶ms->sop_inc.inc_faddr, - params->sop_inc.inc_lport, - params->sop_inc.inc_fport, - pcbinfo->ipi_hashmask); + inpi.hash = INP_PCBHASH( + ¶ms->sop_inc.inc_faddr, + params->sop_inc.inc_lport, + params->sop_inc.inc_fport, + pcbinfo->ipi_hashmask); } while ((inp = inp_next(&inpi)) != NULL) if (inp->inp_gencnt == params->sop_id) {