From nobody Mon Dec 20 20:42:42 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 989E518FE811; Mon, 20 Dec 2021 20:42:42 +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 4JHs3Q2QWMz4vn2; Mon, 20 Dec 2021 20:42:42 +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 3247F1D01D; Mon, 20 Dec 2021 20:42:42 +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 1BKKggHS077230; Mon, 20 Dec 2021 20:42:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BKKgg0Q077229; Mon, 20 Dec 2021 20:42:42 GMT (envelope-from git) Date: Mon, 20 Dec 2021 20:42:42 GMT Message-Id: <202112202042.1BKKgg0Q077229@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: 2a28b045ca7f - main - tcp_twrespond: send signed segment when connection is TCP-MD5 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: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a28b045ca7f9b24dc2a8fee2148578edfc87143 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640032962; 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=k+7cDqXYnltG2UkrFuAItSsWDhAOcsEFVR5ayZ0Ucg0=; b=YYxttwUuNDPLJjwWwBSFvmKXz/wMgm4kz2tmuWfsDJxhJTWZ+d5EZZe4XPKbg/EYPnZoyg ol32ZHs+7+m8qGelAGkna0LNro8MgB4BByH7n6jRNCsRsThPybogA69gojIUD8pfhC4u1B TJ9CVJoVSVKmEhERDLd25naSPEmsH1rV+Qczd0z/+gMaHha7pAEdY3UL+9OyAi2LTic8Zb FohQic+GVRYazr8oMk3DobycrvdI1fgrm7l79W6c1X8og7LRbtrh9Znub49wmgNz/lCbif Pw4Y5OEXqmUSrJrvvFHGdD5r0bgyturLE0HLhYmWbgomCd3j1hR306oXijPxXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640032962; a=rsa-sha256; cv=none; b=Fu34XlLHcx3cfTLYSzcjiIprSPvQ/Io5vWcTarQAtWjT4uotBjZXVR7wbGLKtC+0oVp0HL ARicoFapXmdrPqmViGnX5AGMuFzFNen/Ru9HvwX+VDL9V1jVzLxJNDNW15OI7ineVxBDpR v8Dh7g7qbA4d7HuIWHr2WjrojKZymqjtURXoYnzVi00M7CD6KU6rLiqHuER6EpW8apyneu 0WF8Xjyu6S/e0z8/N6vqudW2SFjMPjOp/f+mrnSn/7V3ht+gjpAqosmugfg1MPGuZDwnpf nfw9x99w39wrEaJpJiE6GwAWQRB+cALe9nGUTPWV/LY8s9EnYZo5i+hdmPk5eQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=2a28b045ca7f9b24dc2a8fee2148578edfc87143 commit 2a28b045ca7f9b24dc2a8fee2148578edfc87143 Author: Robert Wing AuthorDate: 2021-12-20 20:30:24 +0000 Commit: Robert Wing CommitDate: 2021-12-20 20:38:01 +0000 tcp_twrespond: send signed segment when connection is TCP-MD5 When a connection is established to use TCP-MD5, tcp_twrespond() doesn't respond with a signed segment. This results in the host performing the active close to remain in a TIME_WAIT state and the other host in the LAST_ACK state. Fix this by sending a signed segment when the connection is established to use TCP-MD5. Reviewed by: glebius Differential Revision: https://reviews.freebsd.org/D33490 --- sys/netinet/tcp_timewait.c | 16 ++++++++++++++++ sys/netinet/tcp_var.h | 1 + 2 files changed, 17 insertions(+) diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index 999328df8392..52f8002d8505 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_ipsec.h" #include "opt_tcpdebug.h" #include @@ -96,6 +97,9 @@ __FBSDID("$FreeBSD$"); #include #include + +#include + #include #include @@ -325,6 +329,7 @@ tcp_twstart(struct tcpcb *tp) tw->t_port = tp->t_port; tw->rcv_nxt = tp->rcv_nxt; tw->tw_time = 0; + tw->tw_flags = tp->t_flags; /* XXX * If this code will @@ -669,6 +674,10 @@ tcp_twrespond(struct tcptw *tw, int flags) to.to_tsval = tcp_ts_getticks() + tw->ts_offset; to.to_tsecr = tw->t_recent; } +#if defined(IPSEC_SUPPORT) || defined(TCP_SIGNATURE) + if (tw->tw_flags & TF_SIGNATURE) + to.to_flags |= TOF_SIGNATURE; +#endif optlen = tcp_addoptions(&to, (u_char *)(th + 1)); if (udp) { @@ -686,6 +695,13 @@ tcp_twrespond(struct tcptw *tw, int flags) th->th_flags = flags; th->th_win = htons(tw->last_win); +#if defined(IPSEC_SUPPORT) || defined(TCP_SIGNATURE) + if (tw->tw_flags & TF_SIGNATURE) { + if (!TCPMD5_ENABLED() || + TCPMD5_OUTPUT(m, th, to.to_signature) != 0) + return (-1); + } +#endif #ifdef INET6 if (isipv6) { if (tw->t_port) { diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index c8e262ddf357..92f3a76b480c 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -535,6 +535,7 @@ struct tcptw { u_int32_t ts_offset; /* our timestamp offset */ int tw_time; TAILQ_ENTRY(tcptw) tw_2msl; + u_int tw_flags; /* tcpcb t_flags */ }; #define intotcpcb(ip) ((struct tcpcb *)(ip)->inp_ppcb)