From nobody Mon Oct 03 22:40:41 2022 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 4MhG5600YDz4fLsN; Mon, 3 Oct 2022 22:40: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 4MhG556gYBz3LdR; Mon, 3 Oct 2022 22:40:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664836841; 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=zOZCZhjHCe3jupjbdXNSHDDDzVklu96mW0tmU19ywa0=; b=lpjI/g3VmpuZMPRNrFdwyZRSrTBO5FcSkZc3yYEliWQilLbXFW+Lsgl39+RBoh8iNnHrvx MMULEdHAtBEYn31W2aDTfDB304eygSl1jM+BetGcibsyybgvr2J2z8w2zkDc+YlvbvUh9p cvvaDuwxQ5+M2xv5YFqiknEk3L/vSGEkdNk9s9t2fx2frSsvDIdDNGnyJP2DNGFvYHwu/m 5PSFoKP9aups/9maPJcIBz73Kvd4Qxh/qGYqdkVStNf8OmzM3+4qvhamYD+D1bAmo1YXHB kzl80vkitt4F1VpIGccWXWEGVxoEmpAme6Sq4FZnte4rVDdW6iI3FAEDqkekCQ== 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 4MhG555jy5zM5V; Mon, 3 Oct 2022 22:40:41 +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 293Mef0o024948; Mon, 3 Oct 2022 22:40:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 293MefUO024947; Mon, 3 Oct 2022 22:40:41 GMT (envelope-from git) Date: Mon, 3 Oct 2022 22:40:41 GMT Message-Id: <202210032240.293MefUO024947@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 4edff766cb91 - main - tcp: correct simultaneous SYN ECN reaction in RFC3168 mode. 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: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4edff766cb91ef87e3181c64fa7b3adf1a8ca8bf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664836841; 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=zOZCZhjHCe3jupjbdXNSHDDDzVklu96mW0tmU19ywa0=; b=PAkByjsSdOldL4bGizR3IAJ2GGxS4nY/dvXhEmqt9f9bgeE1tQloBmMrV5Vl64R+k29YbF rmI88BnkxAt98M0brgFj91s5khtHvceZzFN+jbOAnJQWDFdJl2F+s6wDhT8pMw9Ub0ZaK6 cZ4oXn0awCT0AAbqwMhfVWX3q0eu2f0xI8phKI7XLrWSah3fw81FICj6SoT8w4b1V6ZI1q fjPtcJuJKnY7bVty3O9xPs+1iDNx9yhquhj8at5ATAr+FlJBSPt3EJfaoiVnSZVCYRjEFi lodCUpaKR9Cmf27r52Oof3CkP3HA2/ykZp1OAajjeGWpeOeSxJEbpaO/OPm5qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664836841; a=rsa-sha256; cv=none; b=IpjJTBGth2AqgzMVDCugjOzJeiXlL3mo6nJceq/m0z/GVR7GgwkvUlrsqxdTDvSNeWHlXd C+ttpP4bvWpGsIw/9ywlBWDMr3gxKxqOMItdaSrEPM3LXrH0IKiphBqKVbb2TC3HOqc8NA wyGdxcwxyIo3JVQLUY3er4A6gHjtSvFf5GwzR4BovzmyHUqM/n/Etb0J+B9B5BJSTL6EIq RV5Z2BiMRgjdbzNehNURxVr0Yimwa7+CWVMGvI6gqmUswA8ns85cRQom9nYCnmeCFMcVvq 23asJziFtHiAKm32mT5arvd/RgKHzJdsRDtKNAxi46C7/sgAUUgsAQfF//wbZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=4edff766cb91ef87e3181c64fa7b3adf1a8ca8bf commit 4edff766cb91ef87e3181c64fa7b3adf1a8ca8bf Author: Richard Scheffenegger AuthorDate: 2022-10-03 22:22:25 +0000 Commit: Richard Scheffenegger CommitDate: 2022-10-03 22:24:28 +0000 tcp: correct simultaneous SYN ECN reaction in RFC3168 mode. Ensure that an RFC3168 ECN reaction only occurs on non-SYN segments. Reviewed By: tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D36867 --- sys/netinet/tcp_ecn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_ecn.c b/sys/netinet/tcp_ecn.c index 05591c2de2f7..b9f477a1bf4c 100644 --- a/sys/netinet/tcp_ecn.c +++ b/sys/netinet/tcp_ecn.c @@ -315,7 +315,7 @@ tcp_ecn_input_segment(struct tcpcb *tp, uint16_t thflags, int iptos) } } else { /* RFC3168 ECN handling */ - if (thflags & TH_ECE) + if ((thflags & (TH_SYN | TH_ECE)) == TH_ECE) delta_ace = 1; if (thflags & TH_CWR) { tp->t_flags2 &= ~TF2_ECN_SND_ECE;