From nobody Wed Sep 18 09:49:35 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 4X7v4v6h8Rz5Vbbw; Wed, 18 Sep 2024 09:49:35 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X7v4v68WQz4bjl; Wed, 18 Sep 2024 09:49:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726652975; 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=GYktfKQ3DzSkanDSqkOM2zxL9Ft1r5lZusqkxw3lyWs=; b=BBdT/9sKP1X6qOfaVG/hhYnAgl5PnRsQ0dk/rLsadEjOu6SCEjt86mmgelibGSMpUebyFY htvYFySgxzAwvEbj/JHk5XERzEKfTgmT6fAhEeudgnPlMQXjvrUf4P+8qW7HREaLFpN56U bEHTKXzH3ROCes6gAmxwueXtf4imGFDVuV97+66XgCgPov4/BFnnMiR1eN0IQ8Kp7dlebv /wsdYfdp5BPfSO5x5BjG/kuzHJtHEgATs4yj9LFsbokPj2i1MSGB1tQ5sXefbgFyPDSY9R 7YUBWfOe/U00gQ3RzQ7cgnzQNiT2LcoZoDkaskbkL6/kymatC9iuDktV8LRXNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726652975; a=rsa-sha256; cv=none; b=DJR4B4GN+Zkza0qqKU6nKv2pbVpn3BWxhrMAlhPoHMqM8/KGoTY3SPoZhRvdIEpbBnshUw p00BtnQVaR0WUbNy9oH+yZ4j352q9Q/IP9PIszOyvwlGVqQ2EdKIPWwOFuymnY5JVKq8A0 ARPwVLOD0lP5sQFL9P47LOfEahnaaSfob9ZaX32HrTYrOwsivi553pmZzQKdG0/SJFD9u0 NVqEYjTvn3lzLqRW13PY4RSHXqdcvlQtww+ad04cksn6J1BjHawMokIaGD/w0U6pjx1omx 6Ca6QED6n0DDr7wHGX3qw9DzsN8B8uYST9BoYcoSp07CVQ+ilqPxNFibE0YD0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726652975; 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=GYktfKQ3DzSkanDSqkOM2zxL9Ft1r5lZusqkxw3lyWs=; b=I4zAOhawleFjJSwn5PzlHQF7O92D45YlGinlMpoAwAgoAVe4QJ5kdlL/6JLaFB181RLvRt Dw+az8ys/hoGR3q2TJVdDPXVbl1nA3CTvKeRGYwn8nI3HxUB0uyN3ZtdvKz85Scq6PPK2c 0KwSp+WDKpIIJJ1FfCTiEW1IxrNxo1yIQIr7YCSh1JXwNB0y7Bw6hyFyj0NvCRI+R5LjZ7 Zo8/2gnISV7FSDhgNVtgytVwttCtCVT/VCe0NZ4Xo77DyPdrHttbsaCPCdSpHhQy0lzbL0 dpKIVaTHf6hM02UIEsDpzcPil0mKszsW2tNLIrGP7DR+ldBJK2VfLkNwgCxFuA== 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 4X7v4v5g73zH6P; Wed, 18 Sep 2024 09:49:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48I9nZu5011811; Wed, 18 Sep 2024 09:49:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48I9nZku011808; Wed, 18 Sep 2024 09:49:35 GMT (envelope-from git) Date: Wed, 18 Sep 2024 09:49:35 GMT Message-Id: <202409180949.48I9nZku011808@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: 0a05ea1f56e6 - main - tcp: keep syncache flags when updating ECN info 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 0a05ea1f56e65ec0477d56daf5ed623087464082 Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=0a05ea1f56e65ec0477d56daf5ed623087464082 commit 0a05ea1f56e65ec0477d56daf5ed623087464082 Author: Richard Scheffenegger AuthorDate: 2024-09-18 09:18:00 +0000 Commit: Richard Scheffenegger CommitDate: 2024-09-18 09:18:30 +0000 tcp: keep syncache flags when updating ECN info While processing the ECN flags of an incoming packet, incorrectly cleared all other syncache flags. Reported by: tuexen Reviewed By: tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D46694 --- sys/netinet/tcp_syncache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index d0a7690256f4..80bf12474c1c 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1538,7 +1538,7 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, */ if (sc->sc_flags & SCF_ECN_MASK) { sc->sc_flags &= ~SCF_ECN_MASK; - sc->sc_flags = tcp_ecn_syncache_add(tcp_get_flags(th), iptos); + sc->sc_flags |= tcp_ecn_syncache_add(tcp_get_flags(th), iptos); } #ifdef MAC /*