From patchwork Tue May 19 08:04:42 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralf Lici X-Patchwork-Id: 4954 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:324e:b0:84a:48f:a1fd with SMTP id s14csp2263001maf; Tue, 19 May 2026 01:06:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AFNElJ/DvngBm5gjcIRvbEkMfeQFAtuLxE4uaIaA0iRYcEcsBVfZ3XmGc/oOZCBINR/jkCOj2aj+Ul80MiQ=@openvpn.net X-Received: by 2002:a05:6820:2910:b0:696:2cb1:a019 with SMTP id 006d021491bc7-69c9436f529mr11919520eaf.28.1779177961000; Tue, 19 May 2026 01:06:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1779177960; cv=none; d=google.com; s=arc-20240605; b=aKqWnkquzmIVOCFIPin0IZ1yW5A+oYtq6CF2bNYLQGTQXgu1jKTNSd9yx8nMXZuvSm 7K/Dh5zfd+fwwHn7XMfgCBoH5SaDL0Kr1K9gjvAEWIEhvkXSNg/M83ReqOm/2Tvuho2l ssvlcs/e9nTt2HM1/wNKISXZoYTY6NCjjYiuUXj+488paxeLI3tlaT9rFFsQ+/T/fQZ7 6nFP9+zJNjN0Hbj+yycklf2Sm5PAFwm/eyFPLubR5ngRoXAUVPIEQqPDeKy3vObT+Fq+ dzARdGFBUnyyHeETgg2VMSG5ZOkJ2lMvFnJsztu9pju8Exy2iQZZLLkEaOAuwXVpoOMp szJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:dkim-signature :dkim-signature:dkim-signature; bh=kdXG2UiYRKXRgWRYqeXNrH+4lIFsoqu5PBeKxpGun90=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=dGRyDHBMXCCX7Ri4X5ZJ2NP0E1atjeuRdvNCQVzRXuLvgEorVOlCvMR0ZuLf3pB00h gnxLda1u0JlWUZGp0c3ngJsDlRmb+/ZfRtShlCkYEIrswxCZ29mEfP+2PoVKobU0VyNM Pe5OWAQM0LRXPeTSO62I1ELU8gJke21XTabHnREtxgSzotOBXRy1zYptKbk3uHgzyyvF 1mpHoJFj4tVi6pOa3YlACIRPtzBwIvpb9WKLp7H29zvv3hVvE6ukMb3P7ZhVwRW28hi3 YsZxhAtCeJY1r0wZQiy6bqIRBOSQyq5E5RliirFH1y/D2sBYY2/wZzvnHEd3UNyIvKSe G9pA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=iCsrn+Xy; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=XF1sI9Wq; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=R1mAiHcC; dkim=neutral (body hash did not verify) header.i=@mandelbit.com header.s=MBO0001 header.b=b4gcjtfi; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 586e51a60fabf-43a94f57065si5462530fac.32.2026.05.19.01.06.00 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 May 2026 01:06:00 -0700 (PDT) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=iCsrn+Xy; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=XF1sI9Wq; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=R1mAiHcC; dkim=neutral (body hash did not verify) header.i=@mandelbit.com header.s=MBO0001 header.b=b4gcjtfi; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Subject:MIME-Version:Message-ID:Date:To:From:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=kdXG2UiYRKXRgWRYqeXNrH+4lIFsoqu5PBeKxpGun90=; b=iCsrn+XyQ1hrzTH+Gw8fU/8+Yo 7uZFdTFYsZ8HH0D0+/U9wK7tgsfUpwBLHYv7APsO934nsg4XmulQ61EWd7dGwLASXmjl71vLHyLLE Y5q4DUkAVtaMC1Uj9qMlSzclF6EJrglS6cNNB2BMLl5D/RMwEgBhuEpnJKOsuEu7dtDA=; Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1wPFSX-0005rx-2b; Tue, 19 May 2026 08:05:49 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1wPFST-0005ro-8m for openvpn-devel@lists.sourceforge.net; Tue, 19 May 2026 08:05:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-ID: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=7QC2l8qDZvAf44ABZOWwe3gDYQN0dhoWaNzG4gRhy0k=; b=XF1sI9WqFDvqLXn+Ymiv1R3o6t 6CF0MDqitzt1/ra9In4TP0xKRFSwVCvYvsezghIBIH4j7LBvpu+A/Ct4riDvinxyQ7rzkLxZN2klZ lSuR5Jz3DzpTqChQensZA/tkc9gmn7KW8aJN+APLNmdWwJiyZ/kSQ0Th6p0JQp8DJrW8=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=7QC2l8qDZvAf44ABZOWwe3gDYQN0dhoWaNzG4gRhy0k=; b=R 1mAiHcC/X3k1c+sxw3VDS0tv1tQV7UzDsEsof3vC4LbfMjV9YmvFMu6/PGImHIIyqYVtw+CdNSbJ7 akmPV7aD+LRkYNkqoCkrCE11mQ6y97ZnjymCNuaZfPluVx2l7ZAyBM5KSI2shayM8dtUfuvXLTffo SyLlxHoeb+YhlUj4=; Received: from mout-b-112.mailbox.org ([195.10.208.42]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1wPFSQ-00044U-Jj for openvpn-devel@lists.sourceforge.net; Tue, 19 May 2026 08:05:45 +0000 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:b231:465::1]) (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 mout-b-112.mailbox.org (Postfix) with ESMTPS id 4gKS090HLtzDvNT; Tue, 19 May 2026 10:05:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mandelbit.com; s=MBO0001; t=1779177929; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=7QC2l8qDZvAf44ABZOWwe3gDYQN0dhoWaNzG4gRhy0k=; b=b4gcjtfi1EdepLQyJ20to/t3aP175LopNREBn+SkErj58H1IOv+WdTXM/fgG/wFo0HN2Kj h2rl1DKcHSq5Xk4aUMZKaInUV5UA1vO38XIoMxdmdluf2nozHKj0X5EwuQEXpYsmG4SE2a R47jxK/yk9EUqTEWQOM9Ig9K1x+guStVo4jB9CGpf1630P4+1CzmDUTFlmM58lx4lIYTCP wp9hhEFQL6gsoxz4tyHlOe5QxKTOGmf9ab0/DzTpan34v1Kp5e+zlsiTfYh9+2H974PFBi cxHfbW+yDQcm1oObqx2P/xEX3luTTjOsI0P+gpOTqoWQtrBRo5lzcTF61boXsQ== Authentication-Results: outgoing_mbo_mout; dkim=none; spf=pass (outgoing_mbo_mout: domain of ralf@mandelbit.com designates 2001:67c:2050:b231:465::1 as permitted sender) smtp.mailfrom=ralf@mandelbit.com From: Ralf Lici To: openvpn-devel@lists.sourceforge.net Date: Tue, 19 May 2026 10:04:42 +0200 Message-ID: <20260519080500.120724-1-ralf@mandelbit.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4gKS090HLtzDvNT X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "sfi-spamd-1.hosts.colo.sdot.me", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: xt_TCPMSS has local logic for scanning TCP options and lowering an existing MSS option without increasing it. Move that scan-and-clamp logic into a TCP helper so other networking code can reuse it without duplicating TCP option parsing. Keep xt_TCPMSS responsible for the policy-specific behavior of adding a m [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [195.10.208.42 listed in wl.mailspike.net] X-Headers-End: 1wPFSQ-00044U-Jj Subject: [Openvpn-devel] [PATCH ovpn net-next v3 1/3] tcp: factor out TCP MSS option clamping X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1865603309929186853?= X-GMAIL-MSGID: =?utf-8?q?1865603309929186853?= xt_TCPMSS has local logic for scanning TCP options and lowering an existing MSS option without increasing it. Move that scan-and-clamp logic into a TCP helper so other networking code can reuse it without duplicating TCP option parsing. Keep xt_TCPMSS responsible for the policy-specific behavior of adding a missing MSS option. The helper returns 0 when an existing MSS option was handled, whether or not it had to be lowered. It returns -ENOENT when no MSS option is present and -EINVAL when option parsing finds a malformed option block. xt_TCPMSS treats both non-zero cases like the previous local scan failing to find a clampable MSS option, so the target keeps its existing fallback behavior for adding a missing MSS option or accepting the packet unchanged. The helper expects the caller to ensure that the TCP header and options are linear and writable. Signed-off-by: Ralf Lici --- No changes since v2 https://lore.kernel.org/openvpn-devel/20260518085908.135570-1-ralf@mandelbit.com/ No changes since v1 https://lore.kernel.org/openvpn-devel/20260515075941.102225-1-ralf@mandelbit.com/ include/net/tcp.h | 2 ++ net/ipv4/tcp.c | 60 +++++++++++++++++++++++++++++++++++++++ net/netfilter/xt_TCPMSS.c | 36 ++--------------------- 3 files changed, 64 insertions(+), 34 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index 3c4e6adb0dbd..e722c7d936bf 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -538,6 +538,8 @@ void tcp_parse_options(const struct net *net, const struct sk_buff *skb, struct tcp_options_received *opt_rx, int estab, struct tcp_fastopen_cookie *foc); +int tcp_clamp_mss_option(struct sk_buff *skb, struct tcphdr *th, u16 maxmss); + /* * BPF SKB-less helpers */ diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 21ece4c71612..ef10e530a1ad 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -721,6 +721,66 @@ static inline void tcp_mark_urg(struct tcp_sock *tp, int flags) tp->snd_up = tp->write_seq; } +/** + * tcp_clamp_mss_option - clamp an existing TCP MSS option + * @skb: skb containing the TCP segment + * @th: TCP header in @skb + * @maxmss: upper bound for the TCP MSS option value + * + * Parse the TCP option block and lower an existing MSS option to @maxmss. + * The MSS value is never increased. If the MSS value is changed, the TCP + * checksum in @th is updated. + * + * The caller must ensure that @th and the complete TCP option block are + * present in the linear data area and writable. + * + * Return: 0 on success or when no update is needed, -ENOENT when no MSS + * option is present, or -EINVAL when the TCP option block is malformed. + */ +int tcp_clamp_mss_option(struct sk_buff *skb, struct tcphdr *th, u16 maxmss) +{ + int length = th->doff * 4 - sizeof(*th); + u8 *ptr = (u8 *)(th + 1); + u16 oldmss; + + while (length > 0) { + int opcode = *ptr++; + int opsize; + + switch (opcode) { + case TCPOPT_EOL: + return -ENOENT; + case TCPOPT_NOP: + length--; + continue; + default: + if (length < 2) + return -EINVAL; + + opsize = *ptr++; + if (opsize < 2 || opsize > length) + return -EINVAL; + + if (opcode == TCPOPT_MSS && opsize == TCPOLEN_MSS) { + oldmss = get_unaligned_be16(ptr); + if (!oldmss || oldmss <= maxmss) + return 0; + + put_unaligned_be16(maxmss, ptr); + inet_proto_csum_replace2(&th->check, skb, + htons(oldmss), + htons(maxmss), false); + return 0; + } + + ptr += opsize - 2; + length -= opsize; + } + } + return -ENOENT; +} +EXPORT_SYMBOL_GPL(tcp_clamp_mss_option); + /* If a not yet filled skb is pushed, do not send it if * we have data packets in Qdisc or NIC queues : * Because TX completion will happen shortly, it gives a chance diff --git a/net/netfilter/xt_TCPMSS.c b/net/netfilter/xt_TCPMSS.c index 80e1634bc51f..70983b757229 100644 --- a/net/netfilter/xt_TCPMSS.c +++ b/net/netfilter/xt_TCPMSS.c @@ -30,16 +30,6 @@ MODULE_DESCRIPTION("Xtables: TCP Maximum Segment Size (MSS) adjustment"); MODULE_ALIAS("ipt_TCPMSS"); MODULE_ALIAS("ip6t_TCPMSS"); -static inline unsigned int -optlen(const u_int8_t *opt, unsigned int offset) -{ - /* Beware zero-length options: make finite progress */ - if (opt[offset] <= TCPOPT_NOP || opt[offset+1] == 0) - return 1; - else - return opt[offset+1]; -} - static u_int32_t tcpmss_reverse_mtu(struct net *net, const struct sk_buff *skb, unsigned int family) @@ -77,7 +67,6 @@ tcpmss_mangle_packet(struct sk_buff *skb, const struct xt_tcpmss_info *info = par->targinfo; struct tcphdr *tcph; int len, tcp_hdrlen; - unsigned int i; __be16 oldval; u16 newmss; u8 *opt; @@ -113,29 +102,8 @@ tcpmss_mangle_packet(struct sk_buff *skb, } else newmss = info->mss; - opt = (u_int8_t *)tcph; - for (i = sizeof(struct tcphdr); i <= tcp_hdrlen - TCPOLEN_MSS; i += optlen(opt, i)) { - if (opt[i] == TCPOPT_MSS && opt[i+1] == TCPOLEN_MSS) { - u_int16_t oldmss; - - oldmss = (opt[i+2] << 8) | opt[i+3]; - - /* Never increase MSS, even when setting it, as - * doing so results in problems for hosts that rely - * on MSS being set correctly. - */ - if (oldmss <= newmss) - return 0; - - opt[i+2] = (newmss & 0xff00) >> 8; - opt[i+3] = newmss & 0x00ff; - - inet_proto_csum_replace2(&tcph->check, skb, - htons(oldmss), htons(newmss), - false); - return 0; - } - } + if (tcp_clamp_mss_option(skb, tcph, newmss) == 0) + return 0; /* There is data after the header so the option can't be added * without moving it, and doing so may make the SYN packet From patchwork Tue May 19 08:04:43 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralf Lici X-Patchwork-Id: 4955 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:324e:b0:84a:48f:a1fd with SMTP id s14csp2263175maf; Tue, 19 May 2026 01:06:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AFNElJ+tioppVMQhKHQy+Qj3utjxQ+62TvQ69E/NCT9oKCxehcOnD4/IhJz7cnGOntZD0Jo06LE2Dqputps=@openvpn.net X-Received: by 2002:a05:6808:16a2:b0:47a:4fd:95f0 with SMTP id 5614622812f47-482cb770c3dmr12745736b6e.12.1779177976495; Tue, 19 May 2026 01:06:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1779177976; cv=none; d=google.com; s=arc-20240605; b=A3oQFPhKfiGTvr7xMzrgUeII61ABxZLOXGOdiEUsvJFcDgsQZcUMCT8n+UtMkKnJGL e3xtUaRzJSTJaWvfruxr/wYlGyGl2F7XDIKz9NyTSzv7+3JnhhD/ASZQziYfiyEqIh6s YDYKpxQLowybFky2qab/a7QDC7InKlaILea+ag4gkz81S1OYaQggfAyGNPoRzTppT7/V qoq3YEL3SD/0pH6EPS2Nu/AlHoHALvV/AB3oImO0RgMSCqjA+2D/gEajpN8jOJqdyq16 zXOOAO54oL+yQ7QaCjksRzPJmeUS7ETYYphW3Iydrg8BZv7RnAqdbz1ps8mRcKqbUtOO 1cxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature:dkim-signature:dkim-signature; bh=hyQ/T9YReEHVXIj3FcUU+P8Q85/sIpwdf8QraqzRWEc=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=TYVcifeCGBi0LpkxdYRcS0sUQcieKPYyVoXuef2JHWTHY+UV2tCGhNgkZzdFPc0/JA TvNMbbveXnpupaG7/MWL3ZDe1GTppIE9lHTaaFT9T5HV6iRdDrHqF0Yc39XUUdzJZSqb rA4fc5uU3E29ajsC23ivT7Y3F2WWcl2R8epVS7aSLm8Jli7PHS2w2/Y4vK1a1oQwmxGE H/Qq43OS0JnKcmC21CWDdir4UNXwOVxPvQX+MtC+P1QRywiJ0zqyUnvKelIk0kOJWaPg /9E5FgsbBLnbH/eCWXFlqQTRH/m0sYh6Is/+/cvBU/TLTR/bJ873DvImAk4WCE9sEih4 jOLA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=kRYrb8m3; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=ERv4YZYy; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="gXH0U/8r"; dkim=neutral (body hash did not verify) header.i=@mandelbit.com header.s=MBO0001 header.b=M2Aps9Rk; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 5614622812f47-482ee32b5bbsi7320885b6e.2.2026.05.19.01.06.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 May 2026 01:06:16 -0700 (PDT) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=kRYrb8m3; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=ERv4YZYy; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="gXH0U/8r"; dkim=neutral (body hash did not verify) header.i=@mandelbit.com header.s=MBO0001 header.b=M2Aps9Rk; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Subject:MIME-Version:References:In-Reply-To:Message-ID:Date:To:From:Sender: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=hyQ/T9YReEHVXIj3FcUU+P8Q85/sIpwdf8QraqzRWEc=; b=kRYrb8m3eNdHrxfjHZMP4pMsoZ bzXIV4fUdnBVX48j+s+4p93icyAGUDdYlAv9Ld1yJvEu4zllIzPZFxUjR79T0xSXV7x/FDwQLzTMM 0S+h/Wt8AXftLBlahydEM1yiQ7fdh9gOD9fYWJpZbCjaRJp05KA+juudTXlYkJccICPY=; Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1wPFSu-0002jI-5T; Tue, 19 May 2026 08:06:12 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1wPFSs-0002jB-OO for openvpn-devel@lists.sourceforge.net; Tue, 19 May 2026 08:06:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=LOyBImfAJjOXyuP7W0a4pEAyJFgvW0DpwwwDqBlWhdg=; b=ERv4YZYyZjWKl6awweYmskceCo RQL+yHXhbT+hJOVkLnQLsRzkecT0FuS4bj7Ckf59BDNL1YfujhKyWfeR6UDqVhW2MLc2YAHHKz31s Z9nFyx6E7f2cbNrNJjNLXh0ujKtJu0U2fL+fuDTy3tO161/zOFNYSeHnDXsiLWAyC2ZI=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=LOyBImfAJjOXyuP7W0a4pEAyJFgvW0DpwwwDqBlWhdg=; b=gXH0U/8r8V+4eolhUT1xUpsP+B tPLR7Q4AmjQTgmaMYyrkSFnNjnfRxOGVzuxAOnRV2Tgdo5DkSNOOjz51TS6DkXI8vVHZq1ldDdgJj v+0KgFy84A9V0tjzubwT5D7zxUQx6PXkratwJct+PPvowTU+akI0yDYsGP2wdHvO4iJM=; Received: from mout-b-110.mailbox.org ([195.10.208.55]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1wPFSr-00047w-2z for openvpn-devel@lists.sourceforge.net; Tue, 19 May 2026 08:06:11 +0000 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:b231:465::1]) (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 mout-b-110.mailbox.org (Postfix) with ESMTPS id 4gKS0h0rl4zB0Xw; Tue, 19 May 2026 10:05:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mandelbit.com; s=MBO0001; t=1779177956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LOyBImfAJjOXyuP7W0a4pEAyJFgvW0DpwwwDqBlWhdg=; b=M2Aps9RkuchKwsz5ZEdFZfvgHAdRZk5wVIX8CUrY9s+q02ag26tgfZstWro05nBTdth2K3 SjTVPQXrpHMW7yA5C8kazpiMjb7vxCb1jv6d4PxCoT5godJGa6mE4GOqezF8Zt2n0Yd8tb OgI8PIppnES+iM/ofmJZWXRfMYdR08H0dr3cuqq9KeTfx1NbgG3DngJo5Xz3OGsvkpHZMp 2WGqL/lbEeDEgtNiPt6wK7iURiky2445eOi+h+kXH3u7APqv1qiLllh4NY4GTBDl1vZraN /BvO2lQ2UQRgCis33IemdWaRgfJScH9V0qCvwXVxKZUuLtm900BUAPiVFdeBgQ== Authentication-Results: outgoing_mbo_mout; dkim=none; spf=pass (outgoing_mbo_mout: domain of ralf@mandelbit.com designates 2001:67c:2050:b231:465::1 as permitted sender) smtp.mailfrom=ralf@mandelbit.com From: Ralf Lici To: openvpn-devel@lists.sourceforge.net Date: Tue, 19 May 2026 10:04:43 +0200 Message-ID: <20260519080500.120724-2-ralf@mandelbit.com> In-Reply-To: <20260519080500.120724-1-ralf@mandelbit.com> References: <20260519080500.120724-1-ralf@mandelbit.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4gKS0h0rl4zB0Xw X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "sfi-spamd-2.hosts.colo.sdot.me", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Add support for OpenVPN mssfix in ovpn. This clamps TCP MSS options in SYN and SYN-ACK packets crossing the ovpn device so TCP peers choose segment sizes that fit within the VPN path MTU after OpenVPN [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-Headers-End: 1wPFSr-00047w-2z Subject: [Openvpn-devel] [PATCH ovpn net-next v3 2/3] ovpn: implement TCP MSS clamping X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1865603325698575098?= X-GMAIL-MSGID: =?utf-8?q?1865603325698575098?= Add support for OpenVPN mssfix in ovpn. This clamps TCP MSS options in SYN and SYN-ACK packets crossing the ovpn device so TCP peers choose segment sizes that fit within the VPN path MTU after OpenVPN encapsulation. Store the computed IPv4 MSS clamp value per peer and apply it on both RX and TX paths. IPv6 packets use the same value minus 20 bytes, matching OpenVPN userspace behavior for the larger IPv6 header. Only non-fragmented TCP packets and are considered, and the shared TCP MSS option helper is used to update existing MSS options without increasing them. Signed-off-by: Ralf Lici --- Changes since v2 https://lore.kernel.org/openvpn-devel/20260518085908.135570-2-ralf@mandelbit.com/ - drop the skb when mssfix cannot make the TCP header/options writable - use READ_ONCE for peer->mssfix in ovpn_nl_send_peer and emit the cached value Changes since v1 https://lore.kernel.org/openvpn-devel/20260515075941.102225-2-ralf@mandelbit.com/ - reject IPv4 packet with ihl < 5 - use READ_ONCE and WRITE_ONCE when reading or updating peer->mssfix - validate the mssfix netlink attribute before saving it to avoid partial peer updates on an invalid attribute Documentation/netlink/specs/ovpn.yaml | 12 ++++ drivers/net/ovpn/io.c | 99 +++++++++++++++++++++++++++ drivers/net/ovpn/netlink-gen.c | 9 ++- drivers/net/ovpn/netlink-gen.h | 6 +- drivers/net/ovpn/netlink.c | 19 +++++ drivers/net/ovpn/peer.h | 2 + include/uapi/linux/ovpn.h | 1 + 7 files changed, 142 insertions(+), 6 deletions(-) diff --git a/Documentation/netlink/specs/ovpn.yaml b/Documentation/netlink/specs/ovpn.yaml index b0c782e59a32..6755193a921e 100644 --- a/Documentation/netlink/specs/ovpn.yaml +++ b/Documentation/netlink/specs/ovpn.yaml @@ -171,6 +171,14 @@ attribute-sets: will advertise the tx-id to be used on the link. checks: max: 0xFFFFFF + - + name: mssfix + type: u16 + doc: >- + OpenVPN mssfix value for this peer. TCP MSS options in SYN and + SYN-ACK packets traveling through the ovpn device are clamped to + this value for IPv4. For IPv6, 20 bytes are subtracted before + clamping to account for the larger IPv6 header. - name: peer-new-input subset-of: peer @@ -201,6 +209,8 @@ attribute-sets: name: keepalive-timeout - name: tx-id + - + name: mssfix - name: peer-set-input subset-of: peer @@ -229,6 +239,8 @@ attribute-sets: name: keepalive-timeout - name: tx-id + - + name: mssfix - name: peer-del-input subset-of: peer diff --git a/drivers/net/ovpn/io.c b/drivers/net/ovpn/io.c index 22c555dd962e..03ad46441567 100644 --- a/drivers/net/ovpn/io.c +++ b/drivers/net/ovpn/io.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "ovpnpriv.h" #include "peer.h" @@ -54,12 +55,92 @@ static bool ovpn_is_keepalive(struct sk_buff *skb) return !memcmp(skb->data, ovpn_keepalive_message, OVPN_KEEPALIVE_SIZE); } +/** + * ovpn_apply_mssfix - clamp the MSS on TCP SYN or SYN-ACK packets + * @skb: skb to inspect and possibly modify + * @mssfix: maximum IPv4 MSS value to apply + * + * Verify that @skb carries a TCP SYN or SYN-ACK packet. If so, clamp the + * TCPOPT_MSS option to @mssfix for IPv4, or to @mssfix - 20 for IPv6 to + * account for the larger IPv6 header. + * + * Notes: + * - the function assumes the IP header is fully linear; this is currently + * guaranteed because both TX and RX paths call it only after + * ovpn_ip_check_protocol, which linearizes the IP header; + * - MSS clamping is performed only when a valid TCPOPT_MSS option is present, + * matching the behavior of OpenVPN userspace. + */ +static int ovpn_apply_mssfix(struct sk_buff *skb, u16 mssfix) +{ + const struct ipv6hdr *ipv6h; + const struct iphdr *iph; + struct tcphdr *th; + int thoff, thlen; + __be16 frag_off; + u16 maxmss; + u8 nexthdr; + + switch (skb->protocol) { + case htons(ETH_P_IP): + iph = ip_hdr(skb); + if (unlikely(iph->ihl < 5)) + return -EINVAL; + if (iph->protocol != IPPROTO_TCP || + unlikely(ip_is_fragment(iph))) + return 0; + + thoff = ip_hdrlen(skb); + maxmss = mssfix; + break; + case htons(ETH_P_IPV6): + ipv6h = ipv6_hdr(skb); + nexthdr = ipv6h->nexthdr; + thoff = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &nexthdr, + &frag_off); + if (unlikely(thoff < 0)) + return thoff; + if (nexthdr != IPPROTO_TCP || unlikely(frag_off)) + return 0; + + maxmss = mssfix - 20; + break; + default: + return 0; + } + + if (unlikely(skb->len < thoff + sizeof(struct tcphdr))) + return -EINVAL; + + if (unlikely(skb_ensure_writable(skb, thoff + sizeof(struct tcphdr)))) + return -ENOMEM; + + th = (struct tcphdr *)(skb->data + thoff); + thlen = th->doff * 4; + + if (unlikely(thlen < sizeof(*th))) + return -EINVAL; + + if (likely(!th->syn)) + return 0; + + if (unlikely(skb->len < thoff + thlen)) + return -EINVAL; + + if (unlikely(skb_ensure_writable(skb, thoff + thlen))) + return -ENOMEM; + + th = (struct tcphdr *)(skb->data + thoff); + return tcp_clamp_mss_option(skb, th, maxmss); +} + /* Called after decrypt to write the IP packet to the device. * This method is expected to manage/free the skb. */ static void ovpn_netdev_write(struct ovpn_peer *peer, struct sk_buff *skb) { unsigned int pkt_len; + u16 mssfix; int ret; /* @@ -74,6 +155,16 @@ static void ovpn_netdev_write(struct ovpn_peer *peer, struct sk_buff *skb) */ skb->ip_summed = CHECKSUM_NONE; + /* apply the MSS fix after resetting the checksum state in order to + * avoid using stale metadata when updating the checksum + */ + mssfix = READ_ONCE(peer->mssfix); + if (mssfix && unlikely(ovpn_apply_mssfix(skb, mssfix) == -ENOMEM)) { + dev_dstats_rx_dropped(peer->ovpn->dev); + kfree_skb(skb); + return; + } + /* skb hash for transport packet no longer valid after decapsulation */ skb_clear_hash(skb); @@ -336,12 +427,20 @@ static bool ovpn_encrypt_one(struct ovpn_peer *peer, struct sk_buff *skb) static void ovpn_send(struct ovpn_priv *ovpn, struct sk_buff *skb, struct ovpn_peer *peer) { + const u16 mssfix = READ_ONCE(peer->mssfix); struct sk_buff *curr, *next; /* this might be a GSO-segmented skb list: process each skb * independently */ skb_list_walk_safe(skb, curr, next) { + if (mssfix && + unlikely(ovpn_apply_mssfix(curr, mssfix) == -ENOMEM)) { + dev_dstats_tx_dropped(ovpn->dev); + kfree_skb(curr); + continue; + } + if (unlikely(!ovpn_encrypt_one(peer, curr))) { dev_dstats_tx_dropped(ovpn->dev); kfree_skb(curr); diff --git a/drivers/net/ovpn/netlink-gen.c b/drivers/net/ovpn/netlink-gen.c index 2147cec7c2c5..8fd24af5717a 100644 --- a/drivers/net/ovpn/netlink-gen.c +++ b/drivers/net/ovpn/netlink-gen.c @@ -55,7 +55,7 @@ const struct nla_policy ovpn_keydir_nl_policy[OVPN_A_KEYDIR_NONCE_TAIL + 1] = { [OVPN_A_KEYDIR_NONCE_TAIL] = NLA_POLICY_EXACT_LEN(OVPN_NONCE_TAIL_SIZE), }; -const struct nla_policy ovpn_peer_nl_policy[OVPN_A_PEER_TX_ID + 1] = { +const struct nla_policy ovpn_peer_nl_policy[OVPN_A_PEER_MSSFIX + 1] = { [OVPN_A_PEER_ID] = NLA_POLICY_FULL_RANGE(NLA_U32, &ovpn_a_peer_id_range), [OVPN_A_PEER_REMOTE_IPV4] = { .type = NLA_BE32, }, [OVPN_A_PEER_REMOTE_IPV6] = NLA_POLICY_EXACT_LEN(16), @@ -80,13 +80,14 @@ const struct nla_policy ovpn_peer_nl_policy[OVPN_A_PEER_TX_ID + 1] = { [OVPN_A_PEER_LINK_RX_PACKETS] = { .type = NLA_UINT, }, [OVPN_A_PEER_LINK_TX_PACKETS] = { .type = NLA_UINT, }, [OVPN_A_PEER_TX_ID] = NLA_POLICY_FULL_RANGE(NLA_U32, &ovpn_a_peer_tx_id_range), + [OVPN_A_PEER_MSSFIX] = { .type = NLA_U16, }, }; const struct nla_policy ovpn_peer_del_input_nl_policy[OVPN_A_PEER_ID + 1] = { [OVPN_A_PEER_ID] = NLA_POLICY_FULL_RANGE(NLA_U32, &ovpn_a_peer_id_range), }; -const struct nla_policy ovpn_peer_new_input_nl_policy[OVPN_A_PEER_TX_ID + 1] = { +const struct nla_policy ovpn_peer_new_input_nl_policy[OVPN_A_PEER_MSSFIX + 1] = { [OVPN_A_PEER_ID] = NLA_POLICY_FULL_RANGE(NLA_U32, &ovpn_a_peer_id_range), [OVPN_A_PEER_REMOTE_IPV4] = { .type = NLA_BE32, }, [OVPN_A_PEER_REMOTE_IPV6] = NLA_POLICY_EXACT_LEN(16), @@ -100,9 +101,10 @@ const struct nla_policy ovpn_peer_new_input_nl_policy[OVPN_A_PEER_TX_ID + 1] = { [OVPN_A_PEER_KEEPALIVE_INTERVAL] = { .type = NLA_U32, }, [OVPN_A_PEER_KEEPALIVE_TIMEOUT] = { .type = NLA_U32, }, [OVPN_A_PEER_TX_ID] = NLA_POLICY_FULL_RANGE(NLA_U32, &ovpn_a_peer_tx_id_range), + [OVPN_A_PEER_MSSFIX] = { .type = NLA_U16, }, }; -const struct nla_policy ovpn_peer_set_input_nl_policy[OVPN_A_PEER_TX_ID + 1] = { +const struct nla_policy ovpn_peer_set_input_nl_policy[OVPN_A_PEER_MSSFIX + 1] = { [OVPN_A_PEER_ID] = NLA_POLICY_FULL_RANGE(NLA_U32, &ovpn_a_peer_id_range), [OVPN_A_PEER_REMOTE_IPV4] = { .type = NLA_BE32, }, [OVPN_A_PEER_REMOTE_IPV6] = NLA_POLICY_EXACT_LEN(16), @@ -115,6 +117,7 @@ const struct nla_policy ovpn_peer_set_input_nl_policy[OVPN_A_PEER_TX_ID + 1] = { [OVPN_A_PEER_KEEPALIVE_INTERVAL] = { .type = NLA_U32, }, [OVPN_A_PEER_KEEPALIVE_TIMEOUT] = { .type = NLA_U32, }, [OVPN_A_PEER_TX_ID] = NLA_POLICY_FULL_RANGE(NLA_U32, &ovpn_a_peer_tx_id_range), + [OVPN_A_PEER_MSSFIX] = { .type = NLA_U16, }, }; /* OVPN_CMD_PEER_NEW - do */ diff --git a/drivers/net/ovpn/netlink-gen.h b/drivers/net/ovpn/netlink-gen.h index 67cd85f86173..dfca5d8f32ca 100644 --- a/drivers/net/ovpn/netlink-gen.h +++ b/drivers/net/ovpn/netlink-gen.h @@ -18,10 +18,10 @@ extern const struct nla_policy ovpn_keyconf_del_input_nl_policy[OVPN_A_KEYCONF_S extern const struct nla_policy ovpn_keyconf_get_nl_policy[OVPN_A_KEYCONF_CIPHER_ALG + 1]; extern const struct nla_policy ovpn_keyconf_swap_input_nl_policy[OVPN_A_KEYCONF_PEER_ID + 1]; extern const struct nla_policy ovpn_keydir_nl_policy[OVPN_A_KEYDIR_NONCE_TAIL + 1]; -extern const struct nla_policy ovpn_peer_nl_policy[OVPN_A_PEER_TX_ID + 1]; +extern const struct nla_policy ovpn_peer_nl_policy[OVPN_A_PEER_MSSFIX + 1]; extern const struct nla_policy ovpn_peer_del_input_nl_policy[OVPN_A_PEER_ID + 1]; -extern const struct nla_policy ovpn_peer_new_input_nl_policy[OVPN_A_PEER_TX_ID + 1]; -extern const struct nla_policy ovpn_peer_set_input_nl_policy[OVPN_A_PEER_TX_ID + 1]; +extern const struct nla_policy ovpn_peer_new_input_nl_policy[OVPN_A_PEER_MSSFIX + 1]; +extern const struct nla_policy ovpn_peer_set_input_nl_policy[OVPN_A_PEER_MSSFIX + 1]; int ovpn_nl_pre_doit(const struct genl_split_ops *ops, struct sk_buff *skb, struct genl_info *info); diff --git a/drivers/net/ovpn/netlink.c b/drivers/net/ovpn/netlink.c index 291e2e5bb450..2f1a88f6d4e0 100644 --- a/drivers/net/ovpn/netlink.c +++ b/drivers/net/ovpn/netlink.c @@ -184,6 +184,7 @@ static int ovpn_nl_peer_precheck(struct ovpn_priv *ovpn, struct nlattr **attrs) { sa_family_t local_fam, remote_fam; + u16 mssfix; if (NL_REQ_ATTR_CHECK(info->extack, info->attrs[OVPN_A_PEER], attrs, OVPN_A_PEER_ID)) @@ -263,6 +264,15 @@ static int ovpn_nl_peer_precheck(struct ovpn_priv *ovpn, return -EINVAL; } + if (attrs[OVPN_A_PEER_MSSFIX]) { + mssfix = nla_get_u16(attrs[OVPN_A_PEER_MSSFIX]); + if (mssfix > 0 && mssfix <= 20) { + NL_SET_ERR_MSG_FMT_MOD(info->extack, + "mssfix must be 0 (disable) or at least 21"); + return -EINVAL; + } + } + return 0; } @@ -311,6 +321,10 @@ static int ovpn_nl_peer_modify(struct ovpn_peer *peer, struct genl_info *info, if (attrs[OVPN_A_PEER_TX_ID]) peer->tx_id = nla_get_u32(attrs[OVPN_A_PEER_TX_ID]); + if (attrs[OVPN_A_PEER_MSSFIX]) + WRITE_ONCE(peer->mssfix, + nla_get_u16(attrs[OVPN_A_PEER_MSSFIX])); + if (attrs[OVPN_A_PEER_VPN_IPV4]) { rehash = true; peer->vpn_addrs.ipv4.s_addr = @@ -547,6 +561,7 @@ static int ovpn_nl_send_peer(struct sk_buff *skb, const struct genl_info *info, int ret = -EMSGSIZE; struct nlattr *attr; __be16 local_port; + u16 mssfix; void *hdr; int id; @@ -582,6 +597,10 @@ static int ovpn_nl_send_peer(struct sk_buff *skb, const struct genl_info *info, if (nla_put_u32(skb, OVPN_A_PEER_TX_ID, peer->tx_id)) goto err; + mssfix = READ_ONCE(peer->mssfix); + if (mssfix && nla_put_u16(skb, OVPN_A_PEER_MSSFIX, mssfix)) + goto err; + if (peer->vpn_addrs.ipv4.s_addr != htonl(INADDR_ANY)) if (nla_put_in_addr(skb, OVPN_A_PEER_VPN_IPV4, peer->vpn_addrs.ipv4.s_addr)) diff --git a/drivers/net/ovpn/peer.h b/drivers/net/ovpn/peer.h index 328401570cba..b4bae5259bdc 100644 --- a/drivers/net/ovpn/peer.h +++ b/drivers/net/ovpn/peer.h @@ -23,6 +23,7 @@ * @dev_tracker: reference tracker for associated dev * @id: unique identifier, used to match incoming packets * @tx_id: identifier to be used in TX packets + * @mssfix: maximum IPv4 TCP MSS to advertise on tunnelled SYN packets * @vpn_addrs: IP addresses assigned over the tunnel * @vpn_addrs.ipv4: IPv4 assigned to peer on the tunnel * @vpn_addrs.ipv6: IPv6 assigned to peer on the tunnel @@ -66,6 +67,7 @@ struct ovpn_peer { netdevice_tracker dev_tracker; u32 id; u32 tx_id; + u16 mssfix; struct { struct in_addr ipv4; struct in6_addr ipv6; diff --git a/include/uapi/linux/ovpn.h b/include/uapi/linux/ovpn.h index 06690090a1a9..d89168c6894e 100644 --- a/include/uapi/linux/ovpn.h +++ b/include/uapi/linux/ovpn.h @@ -56,6 +56,7 @@ enum { OVPN_A_PEER_LINK_RX_PACKETS, OVPN_A_PEER_LINK_TX_PACKETS, OVPN_A_PEER_TX_ID, + OVPN_A_PEER_MSSFIX, __OVPN_A_PEER_MAX, OVPN_A_PEER_MAX = (__OVPN_A_PEER_MAX - 1) From patchwork Tue May 19 08:04:44 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralf Lici X-Patchwork-Id: 4956 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:324e:b0:84a:48f:a1fd with SMTP id s14csp2263273maf; Tue, 19 May 2026 01:06:27 -0700 (PDT) X-Forwarded-Encrypted: i=2; AFNElJ/ju4Uy2H8aNVGoTQjxusTxLgtLx6wgzEBL9bfA9QOBNABOb4hrnbQNiqL23vi2boFXrV+YdYvR5oc=@openvpn.net X-Received: by 2002:a05:6820:c98:b0:68a:24af:ac51 with SMTP id 006d021491bc7-69c9bff3795mr11644234eaf.55.1779177987621; Tue, 19 May 2026 01:06:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1779177987; cv=none; d=google.com; s=arc-20240605; b=AeJslKyju+yLMBalBZf4mqyviuWzG7dzO/s+RuRmz0vKfJgRBCPO7io+aqyLEUMfUm vcNhylEqfWLctBJWdT5dZgKuwsoL51fXseF+P4i6OWReC39L9b+9lk3XSgTy/gLsquk6 4rA2hQK8XvaadbXh73Uiictu5vBcNpOxg2pB8u6fJLqZJx72b3bthxe1AvE+kY+lQMGS o6pZDogQpFaw+14u7WLiceihbt0ZBY1ujyXVbrrVvLuao2m6PadtICklOnlXh4Cfh+7O 7vtM4qhcUhksTJWi+GD1BPiL/RpbudbXlncmQklv3fHeVB493bSjnuGf4DnOGnCMr/GM i3Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature:dkim-signature:dkim-signature; bh=Cb7FGyjwbatfZAm89QP9HWu0fHFFFzINuiruOifUIH0=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=djZWBoZ3Yy3fKKj8Xego4Uy2uGKwde51H155PdggrGzMREFGO10f7Bk4E1NfyNw5vr xa1n68CofucSX++DBEUZjiU5yPXzMjfBXgXKnmubdfXZ48v5yerbyuwINVfdockx0Swf +QCABuXOjEJ9z311pJMzq1iEzjfFij9w5uHceFk688gPQxd1vSMc+Ljhwr6E2X0uVfeg JASlp8QMSJKY1ieIwLFuxzsTq9SSadQteZ7m5RZ1RVBaLEPpjAgHfJsStbHOyu4gDQXI 8YWdyW9D2A22bgmFb4p0e9iYa1yievpw4QM/wV2K0DFOpS3Lti9fR1rBrqnDonVO+R58 hWeQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b="F/p+TD5P"; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=UGfQNNFz; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=mFC3lLp3; dkim=neutral (body hash did not verify) header.i=@mandelbit.com header.s=MBO0001 header.b="HtI/DDuM"; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 586e51a60fabf-43a94f595f3si5371985fac.76.2026.05.19.01.06.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 May 2026 01:06:27 -0700 (PDT) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b="F/p+TD5P"; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=UGfQNNFz; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=mFC3lLp3; dkim=neutral (body hash did not verify) header.i=@mandelbit.com header.s=MBO0001 header.b="HtI/DDuM"; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Subject:MIME-Version:References:In-Reply-To:Message-ID:Date:To:From:Sender: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Cb7FGyjwbatfZAm89QP9HWu0fHFFFzINuiruOifUIH0=; b=F/p+TD5PEaOmTTgClzYji+58od ITzf2c4FZ+0/E0XfLGiUz77K3/qTuAHNdNkzcfaBATi9j5gN6DqoqjVIpOxM18C7rwuGdez4PikQ0 jaeKcmM/pJ8U6gICl2eInd/THzTBRi542GLzWyNKrF5rIXfwgDYvHoUcytBXur8Atg0k=; Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1wPFT6-0005u1-52; Tue, 19 May 2026 08:06:24 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1wPFT4-0005ts-VX for openvpn-devel@lists.sourceforge.net; Tue, 19 May 2026 08:06:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=HSBrAxgg9TA8Nv4spPH/6U3Nb3eQ/75uJ75ANkxmx9Q=; b=UGfQNNFz0XmBLlK47nmZae2PoV aECa+YrdmskzlGSaW4yNq6a6O91Byecxzazndab8A3UR2HOfQ/QWgeUdWADuIExWfoq3IwfwEuwJk Z+gbue9q9nuMalMdD+NIl6UOY2F7evlt1DKp2TQSeJUjxfl/3SiY56IPxWX4XXg+2Ul4=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=HSBrAxgg9TA8Nv4spPH/6U3Nb3eQ/75uJ75ANkxmx9Q=; b=mFC3lLp3pbZwF7KUKMDk9OCSdI OiJa9FtpYkwEJzsL1PioaBm3RT4x94YbaEzB9mhxlNI+G7pg82s3h2x6Fo3dJiEAruARCamMvjbXL Mtgzc5sDHDUtr8k6IwvBUUHYen4ymqX1YzMa4HvLvKyDzpPoObL5SSaHPGJKMoLagvE0=; Received: from mout-b-106.mailbox.org ([195.10.208.46]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1wPFT2-0004AP-Or for openvpn-devel@lists.sourceforge.net; Tue, 19 May 2026 08:06:22 +0000 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:b231:465::1]) (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 mout-b-106.mailbox.org (Postfix) with ESMTPS id 4gKS0w2K3SzDsKV; Tue, 19 May 2026 10:06:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mandelbit.com; s=MBO0001; t=1779177968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HSBrAxgg9TA8Nv4spPH/6U3Nb3eQ/75uJ75ANkxmx9Q=; b=HtI/DDuMf3MaKaKeEQmyXZ43BMj8WZo4oIggmsMp6U8HlW+hiqA1Qv+9RPGtrdc9pPrSgo ivUpkNzC7dILfxEpM5YG76Q0MR1xXBIVWPfw8P8IST2ZkhE0hp1QX6YsPyohx691mhUPdo 8rzVJzAT4etEAfoeJcZX0VZ58SZAWdyAL82IsWiurALEQyXtuhYAzg4Cf5Ip57A26RP/RO lMOG2S851Z/2VyWXdY0eM9p0DCF7W2wk3bVzwVc0yTDQ3oQoKKm0eBzl8Bo9AM+NX5cLBq 4ereHf1xy06u9nzOcHMm/RRruRKvI4jtwPcjfx9CbYJJCutBVsVrK8q+uEbIyQ== Authentication-Results: outgoing_mbo_mout; dkim=none; spf=pass (outgoing_mbo_mout: domain of ralf@mandelbit.com designates 2001:67c:2050:b231:465::1 as permitted sender) smtp.mailfrom=ralf@mandelbit.com From: Ralf Lici To: openvpn-devel@lists.sourceforge.net Date: Tue, 19 May 2026 10:04:44 +0200 Message-ID: <20260519080500.120724-3-ralf@mandelbit.com> In-Reply-To: <20260519080500.120724-1-ralf@mandelbit.com> References: <20260519080500.120724-1-ralf@mandelbit.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4gKS0w2K3SzDsKV X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "sfi-spamd-1.hosts.colo.sdot.me", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Extend ovpn-cli set_peer to pass the peer mssfix attribute. Use -1 as the selftest CLI sentinel for leaving mssfix unchanged, so existing timeout-only peer updates can keep omitting the netlink attrib [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-Headers-End: 1wPFT2-0004AP-Or Subject: [Openvpn-devel] [PATCH ovpn net-next v3 3/3] selftests: ovpn: add mssfix coverage X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1865603337716006220?= X-GMAIL-MSGID: =?utf-8?q?1865603337716006220?= Extend ovpn-cli set_peer to pass the peer mssfix attribute. Use -1 as the selftest CLI sentinel for leaving mssfix unchanged, so existing timeout-only peer updates can keep omitting the netlink attribute. Add an ovpn test stage that configures mssfix on each side of a peer pair and verifies the MSS advertised on TCP SYN packets seen on the tunnel device. This covers both TX-side and RX-side clamping, and also checks that an invalid non-zero MSS value is rejected. Signed-off-by: Ralf Lici --- No changes since v2 https://lore.kernel.org/openvpn-devel/20260518085908.135570-3-ralf@mandelbit.com/ Changes since v1 https://lore.kernel.org/openvpn-devel/20260515075941.102225-3-ralf@mandelbit.com/ - parse mssfix into long before narrowing in ovpn-cli tools/testing/selftests/net/ovpn/ovpn-cli.c | 20 ++++- .../selftests/net/ovpn/test-close-socket.sh | 4 +- tools/testing/selftests/net/ovpn/test-mark.sh | 4 +- tools/testing/selftests/net/ovpn/test.sh | 75 +++++++++++++++++-- 4 files changed, 90 insertions(+), 13 deletions(-) diff --git a/tools/testing/selftests/net/ovpn/ovpn-cli.c b/tools/testing/selftests/net/ovpn/ovpn-cli.c index d40953375c86..67351f33e7c8 100644 --- a/tools/testing/selftests/net/ovpn/ovpn-cli.c +++ b/tools/testing/selftests/net/ovpn/ovpn-cli.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -129,6 +130,7 @@ struct ovpn_ctx { __u32 keepalive_interval; __u32 keepalive_timeout; + int mssfix; enum ovpn_key_direction key_dir; enum ovpn_key_slot key_slot; @@ -732,6 +734,8 @@ static int ovpn_set_peer(struct ovpn_ctx *ovpn) ovpn->keepalive_interval); NLA_PUT_U32(ctx->nl_msg, OVPN_A_PEER_KEEPALIVE_TIMEOUT, ovpn->keepalive_timeout); + if (ovpn->mssfix >= 0) + NLA_PUT_U16(ctx->nl_msg, OVPN_A_PEER_MSSFIX, ovpn->mssfix); nla_nest_end(ctx->nl_msg, attr); ret = ovpn_nl_msg_send(ctx, NULL); @@ -1730,13 +1734,15 @@ static void usage(const char *cmd) fprintf(stderr, "\tmark: socket FW mark value\n"); fprintf(stderr, - "* set_peer : set peer attributes\n"); + "* set_peer : set peer attributes\n"); fprintf(stderr, "\tiface: ovpn interface name\n"); fprintf(stderr, "\tpeer_id: peer ID of the peer to modify\n"); fprintf(stderr, "\tkeepalive_interval: interval for sending ping messages\n"); fprintf(stderr, "\tkeepalive_timeout: time after which a peer is timed out\n"); + fprintf(stderr, + "\tmssfix: TCP MSS value to clamp SYN packets to (0 disables, -1 leaves unchanged)\n"); fprintf(stderr, "* del_peer : delete peer\n"); fprintf(stderr, "\tiface: ovpn interface name\n"); @@ -2166,6 +2172,7 @@ static int ovpn_run_cmd(struct ovpn_ctx *ovpn) static int ovpn_parse_cmd_args(struct ovpn_ctx *ovpn, int argc, char *argv[]) { + long mssfix; int ret; /* no args required for LISTEN_MCAST */ @@ -2307,7 +2314,7 @@ static int ovpn_parse_cmd_args(struct ovpn_ctx *ovpn, int argc, char *argv[]) } break; case CMD_SET_PEER: - if (argc < 6) + if (argc < 7) return -EINVAL; ovpn->peer_id = strtoul(argv[3], NULL, 10); @@ -2329,6 +2336,14 @@ static int ovpn_parse_cmd_args(struct ovpn_ctx *ovpn, int argc, char *argv[]) "keepalive interval value out of range\n"); return -1; } + + errno = 0; + mssfix = strtol(argv[6], NULL, 10); + if (errno == ERANGE || mssfix < -1 || mssfix > UINT16_MAX) { + fprintf(stderr, "mssfix value out of range\n"); + return -1; + } + ovpn->mssfix = mssfix; break; case CMD_DEL_PEER: if (argc < 4) @@ -2442,6 +2457,7 @@ int main(int argc, char *argv[]) memset(&ovpn, 0, sizeof(ovpn)); ovpn.sa_family = AF_UNSPEC; ovpn.cipher = OVPN_CIPHER_ALG_NONE; + ovpn.mssfix = -1; ovpn.cmd = ovpn_parse_cmd(argv[1]); if (ovpn.cmd == CMD_INVALID) { diff --git a/tools/testing/selftests/net/ovpn/test-close-socket.sh b/tools/testing/selftests/net/ovpn/test-close-socket.sh index af1532b4d2da..091c0103bdba 100755 --- a/tools/testing/selftests/net/ovpn/test-close-socket.sh +++ b/tools/testing/selftests/net/ovpn/test-close-socket.sh @@ -41,10 +41,10 @@ ovpn_prepare_network() { peer_ns="ovpn_peer${p}" ovpn_cmd_ok "set peer0 timeout for peer ${p}" \ ip netns exec ovpn_peer0 ${OVPN_CLI} set_peer tun0 \ - ${p} 60 120 + ${p} 60 120 -1 ovpn_cmd_ok "set peer${p} timeout for peer ${p}" \ ip netns exec "${peer_ns}" ${OVPN_CLI} set_peer \ - tun${p} $((p + OVPN_ID_OFFSET)) 60 120 + tun${p} $((p + OVPN_ID_OFFSET)) 60 120 -1 done } diff --git a/tools/testing/selftests/net/ovpn/test-mark.sh b/tools/testing/selftests/net/ovpn/test-mark.sh index 5a8f47554286..11af23beea2a 100755 --- a/tools/testing/selftests/net/ovpn/test-mark.sh +++ b/tools/testing/selftests/net/ovpn/test-mark.sh @@ -54,10 +54,10 @@ ovpn_mark_prepare_network() { peer_ns="ovpn_peer${p}" ovpn_cmd_ok "set peer0 timeout for peer ${p}" \ ip netns exec ovpn_peer0 "${OVPN_CLI}" set_peer tun0 \ - "${p}" 60 120 + "${p}" 60 120 -1 ovpn_cmd_ok "set peer${p} timeout for peer ${p}" \ ip netns exec "${peer_ns}" "${OVPN_CLI}" set_peer \ - tun"${p}" $((p + OVPN_ID_OFFSET)) 60 120 + tun"${p}" $((p + OVPN_ID_OFFSET)) 60 120 -1 done } diff --git a/tools/testing/selftests/net/ovpn/test.sh b/tools/testing/selftests/net/ovpn/test.sh index c06e3135fbef..a0630034351a 100755 --- a/tools/testing/selftests/net/ovpn/test.sh +++ b/tools/testing/selftests/net/ovpn/test.sh @@ -49,10 +49,10 @@ ovpn_prepare_network() { peer_ns="ovpn_peer${p}" ovpn_cmd_ok "set peer0 timeout for peer ${p}" \ ip netns exec ovpn_peer0 ${OVPN_CLI} set_peer tun0 \ - ${p} 60 120 + ${p} 60 120 -1 ovpn_cmd_ok "set peer${p} timeout for peer ${p}" \ ip netns exec "${peer_ns}" ${OVPN_CLI} set_peer \ - tun${p} $((p + OVPN_ID_OFFSET)) 60 120 + tun${p} $((p + OVPN_ID_OFFSET)) 60 120 -1 done } @@ -142,6 +142,66 @@ ovpn_run_iperf() { wait "${iperf_pid}" || return 1 } +ovpn_run_mssfix_flow() { + local filter + local iperf_pid + local direction="$1" + local mssfix="$2" + local tcpdump_pid + + filter="tcp and src host 5.5.5.1 and dst host 5.5.5.2" + filter="${filter} and tcp[tcpflags] & tcp-syn != 0" + + ovpn_run_bg iperf_pid ip netns exec ovpn_peer1 iperf3 -1 -s + sleep 1 + + timeout 3s ip netns exec ovpn_peer1 tcpdump --immediate-mode -l -p \ + -vv -nn -i tun1 -c 1 "${filter}" 2>&1 | + grep -iq "mss ${mssfix}" & + tcpdump_pid=$! + sleep 0.3 + + ovpn_cmd_ok "run ${direction} mssfix TCP flow" \ + ip netns exec ovpn_peer0 iperf3 -t 1 -c 5.5.5.2 + + ovpn_cmd_ok "capture ${direction} mssfix TCP SYN" wait "${tcpdump_pid}" + ovpn_cmd_ok "finish ${direction} mssfix TCP server" wait "${iperf_pid}" +} + +ovpn_run_mssfix() { + local peer0_id=$((1 + OVPN_ID_OFFSET)) + + # peer0 will clamp MSS for packets exchanged with peer1 + ovpn_cmd_ok "set peer0 mssfix for peer 1" \ + ip netns exec ovpn_peer0 ${OVPN_CLI} set_peer tun0 1 \ + 60 120 900 + + ovpn_cmd_fail "reject invalid peer0 mssfix for peer 1" \ + ip netns exec ovpn_peer0 ${OVPN_CLI} set_peer tun0 1 \ + 60 120 20 + + ovpn_cmd_ok "clear peer1 mssfix for peer ${peer0_id}" \ + ip netns exec ovpn_peer1 ${OVPN_CLI} set_peer tun1 \ + "${peer0_id}" 60 120 0 + + ovpn_run_mssfix_flow "TX" 900 + + ovpn_cmd_ok "clear peer0 mssfix for peer 1" \ + ip netns exec ovpn_peer0 ${OVPN_CLI} set_peer tun0 1 \ + 60 120 0 + + # peer1 will clamp MSS for packets exchanged with peer0 + ovpn_cmd_ok "set peer1 mssfix for peer ${peer0_id}" \ + ip netns exec ovpn_peer1 ${OVPN_CLI} set_peer tun1 \ + "${peer0_id}" 60 120 901 + + ovpn_run_mssfix_flow "RX" 901 + + ovpn_cmd_ok "clear peer1 mssfix for peer ${peer0_id}" \ + ip netns exec ovpn_peer1 ${OVPN_CLI} set_peer tun1 \ + "${peer0_id}" 60 120 0 +} + ovpn_run_key_rollover() { local p local peer_ns @@ -259,11 +319,11 @@ ovpn_run_timeouts() { # Non-fatal: this may fail in some protocol modes. ovpn_cmd_mayfail "set peer0 timeout for peer ${p} (non-fatal)" \ ip netns exec ovpn_peer0 ${OVPN_CLI} set_peer tun0 \ - ${p} 3 3 + ${p} 3 3 -1 peer_ns="ovpn_peer${p}" ovpn_cmd_ok "disable timeout on peer${p} while peer0 adjusts \ state" ip netns exec "${peer_ns}" ${OVPN_CLI} set_peer \ - tun${p} $((p + OVPN_ID_OFFSET)) 0 0 + tun${p} $((p + OVPN_ID_OFFSET)) 0 0 -1 done # wait for peers to timeout sleep 5 @@ -274,7 +334,7 @@ ovpn_run_timeouts() { peer_ns="ovpn_peer${p}" ovpn_cmd_ok "set peer${p} P2P timeout" \ ip netns exec "${peer_ns}" ${OVPN_CLI} set_peer \ - tun${p} $((p + OVPN_ID_OFFSET)) 3 3 + tun${p} $((p + OVPN_ID_OFFSET)) 3 3 -1 done sleep 5 } @@ -293,9 +353,9 @@ trap ovpn_stage_err ERR ktap_print_header if [ "${OVPN_FLOAT}" == "1" ]; then - ktap_set_plan 13 + ktap_set_plan 14 else - ktap_set_plan 12 + ktap_set_plan 13 fi ovpn_cleanup @@ -307,6 +367,7 @@ ovpn_run_stage "run LAN traffic behind peer1" ovpn_run_lan_traffic [ "${OVPN_FLOAT}" == "1" ] && ovpn_run_stage "run floating peer checks" \ ovpn_run_float_mode ovpn_run_stage "run iperf throughput" ovpn_run_iperf +ovpn_run_stage "run mssfix TCP SYN clamp" ovpn_run_mssfix ovpn_run_stage "run key rollout" ovpn_run_key_rollover ovpn_run_stage "query peers" ovpn_run_queries ovpn_run_stage "query missing peer fails" ovpn_query_peer_missing