From nobody Mon Aug 31 13:17:19 2026 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 4hYTzz4T8Nz6qlXP for ; Mon, 31 Aug 2026 13:17:19 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hYTzz3qJDz3R42 for ; Mon, 31 Aug 2026 13:17:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788182239; 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=O4837jLJ6obaAI3gYW92T/JRilMnebz6GPjhCB3CFGE=; b=c3cn0ZMFtpMA/PlvEMIJrwAr0496qpqd05U39Ok3s/pVsbyI4ZN+BhcBwfoJ0ZYtBNptL/ 5brCFqpAyXYDG5PISS+fXu3ziQZYjXxJW0TVQ5cOLmqC/BOhH+VOjwTQpaY+bFAZng5JYW ozBHeutO8pPWDm2GNQRkhFc4wLya+qVj8ku4+OeCGcLM2me2jagBDiUCJaqx8P/qBKWRG0 qpSCtHYg+IA2FYcfMWTsdyYKjXh6wzWXys6ZiFUaPTZKeH7GzllgAANBb5kYFki+WI1nLz +hXJObA0F/vgguQM5emmP2DTuAgDKOvvWCIbDUHtypiwY+9pYCyHUak488PZCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788182239; a=rsa-sha256; cv=none; b=HZJwmyonsxMsmCzJyE29EitL4DYqD0fZ+B7V+X95Ohtu9X+vdurrP0gdz9alPU93i/loDZ oFdqNY28Mu15FWL+m1D1La7Urmt2YUeISzXOYrUheROOyHldfKDiQmrPgYc5bt6kVB53i2 xwT0erBo7pXOVn3h/ukf49Vl62MDChAAtyj3mQrJK4pdvzgt9FdhrJ4ghFK87aKDe/eN6v 5fsOZTe19BYOZDoVRURIfrNdIVL1Ddhj67fB/FHveQ+IamOf8dr3LY6Am9A+L0GDCkvs2a Wr6B5bGuPbIjXnAUg/15s1+eE6RY1C0ABOVq1/jm89aowqQAR0gxj+K0BPT1ZQ== 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=1788182239; 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=O4837jLJ6obaAI3gYW92T/JRilMnebz6GPjhCB3CFGE=; b=CqAVMc1Qee2TvTUIS33cWiPcPJeFRe8pEKx9MjeGsz5KrBjiNAj6AHdR1BW1tTcqLmo7bM UYd80IrCePv5iIEdQCz4dn32OFEKdG3Dhf5t4DdwtPzgB4MK4JvGKfr5YTA5VIDXtGjukt qJDp50oqNjOfFYETyRjaAO15ZCn884R+lkCRy4omLB0Ey8QiyUjR45wmZYvP4kjEHlpyOb S6/iXazqJm3VZus3V7bIjWESmrOmo+AWo9Skvda5xK1YUE+t4ByNpBeEKL8bx/UpvaIKM5 6CW2RRdOqXqEahYwgxdwCwvVxRU9SBZe3i8g7TU8HHabhWaz4z+mACi+oSizMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hYTzz2JlCz1C3l for ; Mon, 31 Aug 2026 13:17:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bbb7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 31 Aug 2026 13:17:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: c6ae11c1b0d9 - main - tcp md5: improve handling of tcps_sig_err_sigopt counter 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/main X-Git-Reftype: branch X-Git-Commit: c6ae11c1b0d96fd2ed0b55c655ff58a46b26ddcb Auto-Submitted: auto-generated Date: Mon, 31 Aug 2026 13:17:19 +0000 Message-Id: <6a957edf.3bbb7.5a433a6e@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c6ae11c1b0d96fd2ed0b55c655ff58a46b26ddcb commit c6ae11c1b0d96fd2ed0b55c655ff58a46b26ddcb Author: Michael Tuexen AuthorDate: 2026-08-31 13:12:54 +0000 Commit: Michael Tuexen CommitDate: 2026-08-31 13:12:54 +0000 tcp md5: improve handling of tcps_sig_err_sigopt counter For non listening TCP endpoints, increment the tcps_sig_err_sigopt counter when TCP MD5 is not enabled in the TCP connection, but a segment containing a TCP MD5 option is received. Also increment the counter when using the RACK or BBR stack. Reported by: Hannes Elfert Reviewed by: rrs MFC after: 1 week MFC to: stable/14 MFC to: stable/15 Differential Revision: https://reviews.freebsd.org/D59249 --- sys/netinet/tcp_input.c | 6 ++---- sys/netinet/tcp_stacks/bbr.c | 5 +++++ sys/netinet/tcp_stacks/rack.c | 5 +++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 17d20e5e6401..e79f652bcb54 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1579,11 +1579,9 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, to.to_flags &= ~TOF_SACK; } #if defined(IPSEC_SUPPORT) || defined(TCP_SIGNATURE) - if ((tp->t_flags & TF_SIGNATURE) != 0 && - (to.to_flags & TOF_SIGNATURE) == 0) { + if ((tp->t_flags & TF_SIGNATURE) == 0 && + (to.to_flags & TOF_SIGNATURE) != 0) TCPSTAT_INC(tcps_sig_err_sigopt); - /* XXX: should drop? */ - } #endif /* * If echoed timestamp is later than the current time, diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 6697b6ecc7db..4b8267d6b4ed 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -11349,6 +11349,11 @@ bbr_do_segment_nounlock(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, */ to.to_flags &= ~TOF_SACK; } +#if defined(IPSEC_SUPPORT) || defined(TCP_SIGNATURE) + if ((tp->t_flags & TF_SIGNATURE) == 0 && + (to.to_flags & TOF_SIGNATURE) != 0) + KMOD_TCPSTAT_INC(tcps_sig_err_sigopt); +#endif /* * If timestamps were negotiated during SYN/ACK and a * segment without a timestamp is received, silently drop diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 3a6a374318ca..4fbb4baa8d38 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -16401,6 +16401,11 @@ rack_do_segment_nounlock(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, */ to.to_flags &= ~TOF_SACK; } +#if defined(IPSEC_SUPPORT) || defined(TCP_SIGNATURE) + if ((tp->t_flags & TF_SIGNATURE) == 0 && + (to.to_flags & TOF_SIGNATURE) != 0) + KMOD_TCPSTAT_INC(tcps_sig_err_sigopt); +#endif if ((tp->t_state >= TCPS_FIN_WAIT_1) && (tp->t_flags & TF_GPUTINPROG)) { /*