From nobody Wed Jan 10 07:45:43 2024 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 4T90GH5p9Jz56K80; Wed, 10 Jan 2024 07:45:43 +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 4T90GH3zxKz4rdF; Wed, 10 Jan 2024 07:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704872743; 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=F+pzVczgbZUOMvXRsv3VD0y2ndvSIN1nCv4DWL3CClM=; b=HP+4dyv0EiK/TFzAuIOk/MDJ1VgqBqvxoA+dIRFxJ2hEyieRZt6KIIb9cTUcjMzdF7D+T9 yCpGHpRok2zEhpGWmN03g9V4SIG8qIcPpFpG6Rd6qdeuF9Ik1Kl+/fYQfC6z+q5JsLtOTI 0eYcsBVDGP7J6DmEVYUytJ0sH4npf2w4h8hiyrCwRiGJ8RI+K01GP8mDB3n7xmlOsSlLL+ NETT44W7aKuNIuhxWzhjLXm0SB/IZq3FlRD/+w4Ovw4I1HQomr2BrSiFwd6794q1yUpjey URRz4fBpeXI/PKBpE71FVXmEvJ1k/RnbTVeG/VGU1STCySH/gSTLowXAdav44Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704872743; 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=F+pzVczgbZUOMvXRsv3VD0y2ndvSIN1nCv4DWL3CClM=; b=jEdLLveWlshfX2PRZIeLRlLoU79jcteobKGOq+9dmgIkTLwXAz3VR13ojHznOGCV4Ewu/c D53GgZMdq57OLg+qqrtQ/7KZIvbKr0gW/tUCjZAHyDxeS6NefmP4v5knwsSGlWXoIK1eFf iZNl01DomGCpjEawvPdGQy/li7ru8N2eZ4kGspNk1r908n+snCOaFW3zT0E7q/FMRH9shC eLITW4PWxAzOQH2bGhzawLZJL3qsMnxyS1y+WHHewYi0B6Bbf2qEmU3nBXr/xiIo4VjMaE nVFog5dF3k+hSAadiH7CgYQeljvNbRStb5yIfkDpgf4O8+QmpE7HAcp63LwWBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704872743; a=rsa-sha256; cv=none; b=Dk/cDYrNQkon6dRN31m2JuZ+9QJLSWdiqe3f16VlATOAMejsVy+8phiXfVhP2FXXHbvmzA QrXVnORLzs/6DkqZzXE6QuXewRKyfbn5myjlk87WEaWi6wuRXX8Xnso27MazV2+QsjRaWT OpBBeBiG+w+zn/pD+WjBKXxWA5wxRLAcEiLsG004qOexcQ+9AS2WFpchPuMCQRjJ5s4eTD 40GNzYfjDq6xBfyyLn2tJ2Ra4w4z5AwgaUklEJ/ymfURv0LuIgnlH7pO3X94DWtTMEGNVh FdP9vEgeISD60hLoHq//YjhvxlkMlnRPsDN0OQWmiBzVdJfxRZK00XyLLoggAA== 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 4T90GH34VvzR0Z; Wed, 10 Jan 2024 07:45:43 +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 40A7jhob075354; Wed, 10 Jan 2024 07:45:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40A7jhDe075351; Wed, 10 Jan 2024 07:45:43 GMT (envelope-from git) Date: Wed, 10 Jan 2024 07:45:43 GMT Message-Id: <202401100745.40A7jhDe075351@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 13720136fbf9 - main - tcpsso: fix when used without -i option 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 13720136fbf951a7b472ce086c9cf2de702799ab Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=13720136fbf951a7b472ce086c9cf2de702799ab commit 13720136fbf951a7b472ce086c9cf2de702799ab Author: Michael Tuexen AuthorDate: 2024-01-10 07:33:09 +0000 Commit: Michael Tuexen CommitDate: 2024-01-10 07:33:09 +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 --- 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 fa0d7309058e..981654577deb 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -2950,25 +2950,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) {