From nobody Sun Sep 22 16:25:09 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 4XBWgV4JKqz5XGwB; Sun, 22 Sep 2024 16:25:10 +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 4XBWgV13Tkz44lP; Sun, 22 Sep 2024 16:25:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727022310; 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=mA2KbHV/cecEfsXWEQj0zNGcvS6ME9TBTzmHXdJWWRQ=; b=wgi7100hEO0wOX7uUmrijoJoNovgXwhgWOb/5BJyRJm+fDv0VUJ06itwYOZZu6Jn8SpV7m u8DL0NtLWtaEyDrZm7iUBxat8/J1zgUwwILppDBVsFYbNusBFD06zFvykYrAmNFM9w486R oHqf1NAFeMhAtdnkva6QcyVXNI3SiFEsvWPlj3mxl9OG66V4zuiNfaoZfmEC/KFpnjzdE0 gtdP515FmrsOjGLMNHffTImlr12PiqtPXUYjR46PihU5cAIDx56dwm9RTQM0v9orr7SKo6 6w7kARoT9UfTv19RTmTtpmTHbXGsZwrBXfwn0Oc8bx3Lo7etLR8/ASll91ysmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727022310; a=rsa-sha256; cv=none; b=QDgjTFaYsfeDiV3iXAZKQcmAhlOxzDpvqY0wBxm+C9p4z7BmltsY+7jQL+i/0qwV2vyFiD K9cjjtss2sPMRTQax2xXQa0VbGsLYnC1xPQpgVMbI3C1Dyxdpjts/XQHd5ucVzC8P+Pvd8 XGx2qahjAq2yOsOZJpqtbOJMgTK+POzb9wNgtcGhQDV/KSYXGApgPwgyS/MXJdIThTJtSq +/GQPVqIDwLLg+NK5Hd45B2k6LM1aQ97OImrwDpqcZ+aDM7rx9DtPHhdaNx2volpksNX9N WiBUC4Q2pnzBu3boCdeOufZCZ6cM+LzCw5crofPXBnzoK5mfuWRmTwL/fa0JeA== 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=1727022310; 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=mA2KbHV/cecEfsXWEQj0zNGcvS6ME9TBTzmHXdJWWRQ=; b=KyQ7EKyXpG+J1EDpQ9JctzMNtDAZA1XL57SI9OReGNKjMdzMoZV+daLyT3/WPSULMvO8mF g4P6uRYSgW/YSl004VNCDoE1rMqf1jTakezHzVEffHNmL6JKwXj7Nh3hTizIdHKXgEvrD6 9B2GPe5s5ycUa2gGgM2Vxqvpd0EAJfkPlDzNKvlJdaNfLHXP5aT9MEu9tHEapSAfcL5WS7 MHPVKhpZ+R4iKKoqDo/r1SWf+z8e42s/yIjoYwhr7KjQOJo8gNkHQ64h42EQuA0cNySB24 bf5DBNvnLUuW9aEia2VPzuxmHfb8qwlaNSB9/gkOgsXlOTEsEf3Q5Tc1OhgWlQ== 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 4XBWgV0Ywvz1NPM; Sun, 22 Sep 2024 16:25:10 +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 48MGP9Xg000264; Sun, 22 Sep 2024 16:25:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48MGP9eY000261; Sun, 22 Sep 2024 16:25:09 GMT (envelope-from git) Date: Sun, 22 Sep 2024 16:25:09 GMT Message-Id: <202409221625.48MGP9eY000261@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Richard Scheffenegger Subject: git: 8fee873d78eb - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 8fee873d78eb8d04ffbc079d0ee01549f5c0d556 Auto-Submitted: auto-generated The branch stable/14 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=8fee873d78eb8d04ffbc079d0ee01549f5c0d556 commit 8fee873d78eb8d04ffbc079d0ee01549f5c0d556 Author: Richard Scheffenegger AuthorDate: 2024-09-18 09:18:00 +0000 Commit: Richard Scheffenegger CommitDate: 2024-09-22 16:24:36 +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. MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D46694 (cherry picked from commit 0a05ea1f56e65ec0477d56daf5ed623087464082) --- 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 e24249048fd6..6e71d14196f5 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1536,7 +1536,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 /*