From nobody Fri Oct 23 17:37:05 2026 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 4jB9FL563fz6xM5Q for ; Fri, 23 Oct 2026 17:37: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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jB9FL3LjBz55gr for ; Fri, 23 Oct 2026 17:37:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792777030; 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=bAGM/vSx2wmMHzcjG+/qdiGJQ4vOpUmNPwElR9/C1Sc=; b=Vg0ClPPSro95wkjS+0aX8vLexDv9JMne4ure+DfNXJV8WE0bEaCVBLixByFC4PlcwiHy4B qr0pXtcCowNrH0RWDt2Jo3t03RW/eNfKAik9oEf93R8r1IU82gGfyFgbZ+c/o1ZeD1XWYi UM5KB6U4/YI2U9WHO8uCjfslLqLqp8gTTDb8XYusq7EIIVQekylRwQRb1VFAFFqqZk/ogu DDqKcFsS0TJ534KF9TIHb3V+aYf2OL1FrDrvZ6SLOpDdWJossVJqearvj1t1oIDIx9jtad vL8ttjDkzVj6UEDs9oDPiNiTKRvInt+RnzT6isOFPePud8b0QIX3FU/K38ZEPg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792777030; b=oJ6/lWYmAZ3/386bqQ1+3AE7+4jHfyurmLk3N6hDlNN9Ie6ld6Vh7d2ONNJ2c/GIZ/H6Qk UMu1Q4JO3Ut52FJzreCDwsUqq0JmDjzFM7N6AAP8X8ZeCxfuy2s0rW20Lqdv9b0DyTdOVu LITWx4zrVF0OqVX8dNNfrAGla0z2HpNj8GJ3T7n96zOsKcyy1UqGl9W39XRJcBwUy2r2EF 9/KEnl7HNpzgaU5DYhaJYfJj6CdWKU5G0n1j2iamRq9zsaRTMT/qvvPpSxTr73kS7Fj/Lk vn89/UIH2eRCZZ30qcvDUPGAjH054u8owsgdJtYwWL/aoOfqKUkbdUTyupaoXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792777030; 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=bAGM/vSx2wmMHzcjG+/qdiGJQ4vOpUmNPwElR9/C1Sc=; b=jViHR2H7T4fD0KkHDWph7yU/hdbzg6Dt+JGBZpdBIAK4+ArGPcWzgvxYbXzKpWRf5Z+JN3 wzk4LRThvr+O5kRCDVPuImDAWTWME5PYWmh1UMgyNdXqr8hi5I/fWY0VzSv2xNsePm8rLq h11HmRhZe2gzaNdcD4IVBjEKptUvlFbRwd6sfYTyT/99+6f+QHsAcCbrikWfe1q6pcsIod vKcylHSK4McXmio9r2Cfcw3Z+gMey4qHPbSJIEuGmVwK+vBZfGTrcj3S2jJQWkU8bMvAzw uAkj1oL0E6p7Zr3HUurAar1gGgEPA9Vev4+X/srBQxQteGDaNI3huaInmu0T9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jB9FL30wHzg8S for ; Fri, 23 Oct 2026 17:37:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 183e0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Oct 2026 17:37:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 3d5546429b99 - stable/15 - tcp md5: improve handling of tcps_sig_err_sigopt counter List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 3d5546429b996626238498da78ebff79580595ee Auto-Submitted: auto-generated Date: Fri, 23 Oct 2026 17:37:05 +0000 Message-Id: <6adb9b41.183e0.55b69421@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=3d5546429b996626238498da78ebff79580595ee commit 3d5546429b996626238498da78ebff79580595ee Author: Michael Tuexen AuthorDate: 2026-08-31 13:12:54 +0000 Commit: Michael Tuexen CommitDate: 2026-10-23 17:35:37 +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 Differential Revision: https://reviews.freebsd.org/D59249 (cherry picked from commit c6ae11c1b0d96fd2ed0b55c655ff58a46b26ddcb) --- 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 a1786952741e..f47e60bede8c 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1606,11 +1606,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 f2d7867df9b4..1bd87ad9bc31 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -11354,6 +11354,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 86ea34f46a05..91aa589bce74 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -16336,6 +16336,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)) { /*