From nobody Wed Feb 1 23:37:51 2023 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 4P6ddC2y2rz3cM6T; Wed, 1 Feb 2023 23:37:51 +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 4P6ddC2RfLz3Ml5; Wed, 1 Feb 2023 23:37:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675294671; 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=hYgfMC1p8rXsFt0loj92s9oWxIZH9b39PvPz6nVPjPI=; b=DEm2dhH2+/HuIQvbU/dBgYxoadMsO7hr9bNex27ZlqA7aLK5GTGj4zTCc9bDxc3H4SbLtH rRRkDOgdiozlyk185hGNDlhLSLvYRbgU3jtccQMTZMjQZc2qTDDqA6XtXHzXlSQ8+nTXu/ pMpo2btf5rWUlR9gfNdsvOqHL6OXur6PN3/fmdarUBlF2PU9DDqcHIr84fODHXWAtNq/3j BzeJe3wFZIGOBhVSuoF4XTxLN/0CD9/DbP/pz8HAPewFDMI/VtgW3Or2Yz3WytOxlPVNT7 ZZxJooAOhkZOaDDfNoYavsq0HzhrT+THoaBJvQU8wih1pnzT79vX78s9n41ycw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675294671; 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=hYgfMC1p8rXsFt0loj92s9oWxIZH9b39PvPz6nVPjPI=; b=euxJ63jqLEA4rb3VD8c0+rcjPAxwJp813CvNLpAZxZMhRJ5TLRZovXC3Hrgr/+4BADDAAF 0RS1g2SYIgabOY8PM55eiPSyfH1VTUPcP+ViMZ2ImjQXyn8i6qYt4o8lzU7rCJUPnHySmX FIRKCw6J+a7Jb4euATvudarGhCNzeM+PcV2uMSDSbi3UH9UtltQ24wjKo3sdU+M0BnuyIg RMKaZYA4E6OrNq8zL2mJI5r3n+JhvF+BhJLmjrO3PGKa/NIX4lhlGe06UV/R37n6Vh0xcj k4rCT4K4/r3SCcrYMPrEFi4BxfVM3kiJAvw40K8yQ74bjChxc6KvnOmdc9eMhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675294671; a=rsa-sha256; cv=none; b=WT++U2ZolOxe5UEtpPowkN62GK1Xx90sP9ifjxXjGoEYTHNefyLK1cb5gqg8XRsGNPNMwb mhjvgoaouoUOxoAu+eZWtyV3nZlaWX4lwtA051UotzizbVDfrY98o78z0KYBAPLcfjud/P X0pGitPjiFDbIy0JLheoEuhD9ju0AUMUQkFTkrmkmv/XlktVQvqJY9rpiP4FJmuchcG9i+ EsFK8AKAWxrR/r2b/eJ3ubon6PekCU/QCJeBdYUB6Tl+eEvP3TMd8wyP17q3OPRIG7ufrO r4SkhqoZIduHzMh6syg2B2UzzkTWB91PmDnqdgE9StAK+gax1y6xmTZDaO4uRg== 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 4P6ddC1LVGzYW2; Wed, 1 Feb 2023 23:37:51 +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 311NbpGR076708; Wed, 1 Feb 2023 23:37:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311NbpFh076707; Wed, 1 Feb 2023 23:37:51 GMT (envelope-from git) Date: Wed, 1 Feb 2023 23:37:51 GMT Message-Id: <202302012337.311NbpFh076707@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: e52b662a3b5f - stable/13 - tcp: honor drop_synfin sysctl variable in TIME-WAIT 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/13 X-Git-Reftype: branch X-Git-Commit: e52b662a3b5f509c3b4b6676b38beaa620b8c1a5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e52b662a3b5f509c3b4b6676b38beaa620b8c1a5 commit e52b662a3b5f509c3b4b6676b38beaa620b8c1a5 Author: Michael Tuexen AuthorDate: 2022-10-03 10:48:30 +0000 Commit: Michael Tuexen CommitDate: 2023-02-01 23:37:21 +0000 tcp: honor drop_synfin sysctl variable in TIME-WAIT Reviewed by: rrs@ Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D36862 (cherry picked from commit f8b5681094dd752604bfa0603ba0be2873698f46) --- sys/netinet/tcp_timewait.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index 970f46274791..f15cf6dae762 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -50,9 +50,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#ifndef INVARIANTS #include -#endif #include #include @@ -389,6 +387,7 @@ tcp_twcheck(struct inpcb *inp, struct tcpopt *to, struct tcphdr *th, struct mbuf *m, int tlen) { struct tcptw *tw; + char *s; int thflags; tcp_seq seq; @@ -439,6 +438,17 @@ tcp_twcheck(struct inpcb *inp, struct tcpopt *to, struct tcphdr *th, */ #endif + /* Honor the drop_synfin sysctl variable. */ + if ((thflags & TH_SYN) && (thflags & TH_FIN) && V_drop_synfin) { + if ((s = tcp_log_addrs(&inp->inp_inc, th, NULL, NULL))) { + log(LOG_DEBUG, "%s; %s: " + "SYN|FIN segment ignored (based on " + "sysctl setting)\n", s, __func__); + free(s, M_TCPLOG); + } + goto drop; + } + /* * If a new connection request is received * while in TIME_WAIT, drop the old connection