From patchwork Fri May 15 07:59:37 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralf Lici X-Patchwork-Id: 4949 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:a719:b0:84a:48f:a1fd with SMTP id hl25csp4386186mab; Fri, 15 May 2026 01:01:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AFNElJ/rt1VyreNflHF4z5HBUiLMEIIGpvQOCbm6Ss9hXh2RfAn0Dxjmm0IkjdV/3BnL/2zTEYVTcPUVI6U=@openvpn.net X-Received: by 2002:a05:6870:521:b0:42f:7bbc:ce82 with SMTP id 586e51a60fabf-43a2dd5e861mr1821372fac.26.1778832069476; Fri, 15 May 2026 01:01:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1778832069; cv=none; d=google.com; s=arc-20240605; b=D/lQuRNp2bPK6OIpgO02LLWjHltmAKcdZaZzhSBkENfYyG1ZM+ehR8d1CHZzaTb9Om aPsDcsSBelEbDbm7PLgwd26xGSTRgK5hFBErLffDqsZjXvITPqmIm1oGWVtj+Bb5BHrq wFr7hqLFmHQzHwx2HCnHN9jS4qLgQFWG+VzezCkb9W+9WLchdJ+/jXonxoQoNqq1GDFi k5Rmx2RhdUbJJgRaC85+np7c8Bzeag7+DvsarB0krwvvcvGQkxG3Mjw6KQZ+HBT5L2AD WDHQq6Wsr16ZItMC3e9yYBFxAw7C1+Al+eopwZiOPyUAKNxUcgFDss3vRn1EosPG3uaK 5Zrw== 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=5U6/gyaIqbdv9PKCR7u8jikUK0ggT/O0DJ+47C3C+NQ=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=Pbc1nprbO6xGOnF8IRFeKb2yoM0rg/+3E49LIpaAal3mU3njpyrevlUZKkT4/g+JyG O1dZlC376JgGc40w2q+VAJk9YG19ISJ56g00fIPCuefKoGGMCwUsmOHgwpUmoEg7rG57 8uhTktUN0izP5+rnb0IiSgiNhfk7lgfU3t7Q9H8AapUA4SkTcAqvUBtUfOpDAcmSlMYx ZYIoD4PK7XdxJYpZjqlpsii81praVrCO4rzGN8zGnhkSKDuLmcvINXzUMKWawg0jVcTd IN/Y/HVUxp19lTm4YaOg5gMb/EGXoTZISCQPn/gfstBeuII3w56jk/zqmgVe7geuOPPC zJAQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=I+WRx1BJ; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=i9DSrVRu; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=XOm3OnSJ; dkim=neutral (body hash did not verify) header.i=@mandelbit.com header.s=MBO0001 header.b="USlR/4dQ"; 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-439fc8134eesi3713498fac.351.2026.05.15.01.01.09 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 May 2026 01:01:09 -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=I+WRx1BJ; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=i9DSrVRu; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=XOm3OnSJ; dkim=neutral (body hash did not verify) header.i=@mandelbit.com header.s=MBO0001 header.b="USlR/4dQ"; 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=5U6/gyaIqbdv9PKCR7u8jikUK0ggT/O0DJ+47C3C+NQ=; b=I+WRx1BJz0IpWr4ilMoL+iZ6Wt kHZ9nRA+qiYdlkEQBM8sMRYNCL00OKoTIS9bgConnf8oQi0m6IKlbvjaf6Ok9pMM/6uS5/gTpgnA6 sc9EwWZnkkcDKrITMbwyn6q0Zz8klhb7BROE1ST4igPLA8eQaG3QkH+fLeA3+hwIcOns=; Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1wNnTi-0000HW-0I; Fri, 15 May 2026 08:00:59 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1wNnTM-0000GB-SW for openvpn-devel@lists.sourceforge.net; Fri, 15 May 2026 08:00:38 +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=QglzCGMVmGgxlaaIVm/L7UBnfGZAxuguSjraxxniJAc=; b=i9DSrVRutZ5bY/fkvfJ7RlDxLX j7Mo5enqCNhhb8LYxq95RWTRn13UmPlX10J28MYYQQ7lYfW7Dm/4cNP//JXlB0WTUrvGXrTJYJXrs mXfZiHWmzwtXBcmLqQamhcTYlIWeqgVx6iNoSC1wC5xHX0o6RhHUomGgpPUxFSmTrtxs=; 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=QglzCGMVmGgxlaaIVm/L7UBnfGZAxuguSjraxxniJAc=; b=X Om3OnSJ3g6/ZHi4FubR+cV1qDiowJrXiJTBcEvVY6wQCUSkuu37yNDUvGPeEAPiqo1NB2ZE1qI5pJ 2KdTcYCXp0xBFTJbxqW4rS/1O9q6JqhC1dgjKLIfp7OTWDfF+5jddBTkWVPfhcxZ+rDz4qM4PnfWf Duvn9zm0/JNohnC0=; Received: from mout-b-210.mailbox.org ([195.10.208.40]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1wNnTB-0004D8-0j for openvpn-devel@lists.sourceforge.net; Fri, 15 May 2026 08:00:31 +0000 Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.102]) (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-210.mailbox.org (Postfix) with ESMTPS id 4gH040366SzDx34; Fri, 15 May 2026 10:00:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mandelbit.com; s=MBO0001; t=1778832016; 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=QglzCGMVmGgxlaaIVm/L7UBnfGZAxuguSjraxxniJAc=; b=USlR/4dQETeoQ19wTojjDYqkMg9/gTInCqolV/ki8qshhCLQ4KGSzIZOAXu17maz517YM8 VuG9xX5GP0DnL281k5Y18+no7KWvAdWF/FHgSMdo8378ovr9MgNRv02cBAb5r8Xmp9bAeN tdtEZtuhJ64JAgtCHMPEzoQLMjXO5EXN52XTyaW3MDX1F12z0LwNsaO0cBatMQlbhkBKJ2 A+rz/PQ3B+OTNDKFDWqtxlnPapmzDBdRCEBQi6IhTd0nfQw4pSb9oIon6VYsUAm/KN6oax KnydA+05ZQGRDJqfbJP/jSeSDIF4gYnUoFOPfJbFAsgcHXT2lu4vqpnH/Qykvg== From: Ralf Lici To: openvpn-devel@lists.sourceforge.net Date: Fri, 15 May 2026 09:59:37 +0200 Message-ID: <20260515075941.102225-1-ralf@mandelbit.com> MIME-Version: 1.0 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: 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_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 X-Headers-End: 1wNnTB-0004D8-0j Subject: [Openvpn-devel] [PATCH ovpn net-next 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?1865240616125487088?= X-GMAIL-MSGID: =?utf-8?q?1865240616125487088?= 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 --- 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 Fri May 15 07:59:38 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralf Lici X-Patchwork-Id: 4947 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:a719:b0:84a:48f:a1fd with SMTP id hl25csp4386132mab; Fri, 15 May 2026 01:01:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AFNElJ/p0glaU6qN0DTDt9ENl7xBn3TpfpzNub/9m/c6CQyuQ8Rftx+Rr3yVBBVah8byoLavNnTIsEhwqY0=@openvpn.net X-Received: by 2002:a05:6871:2ee0:b0:417:3421:13ff with SMTP id 586e51a60fabf-43a2dd89218mr2030371fac.29.1778832067238; Fri, 15 May 2026 01:01:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1778832067; cv=none; d=google.com; s=arc-20240605; b=IwlPXxCBnQKmPRnFOgJSuiTCFPTRcd/pt8R1vIfrLUnW3EZXGFJ4BWQ/TOuxcMikNp dc3AXvBVFe7GtbEzOY1eOrp/BkBfvSek1OoycErSVQvu8c6tm6RIRq7J302ppLYlx3CB ShFQ3E7izPaQInk1GHL0vPWbs33jcBdwk0dL7yFA/yGiDKhjG6sZ8HR7v+A0AVXt+Ny7 gP5qY+ZoUQGvsZpu3cxppgcOnogyxQrry5/lTghQckQ8u+4TyvsrwRl4yHNmANIP8+xW f7gKmAQ/x5jm6bWRAUMDq/cIW3bHzgVEFM7UCfdkVGC+MLU0omgJI9uYq8n5PLJk+PJq d0hg== 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=25pQApcavnenr2SjISxviX2fRH8J0rdWa9dbQ/rQHvM=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=iyOT4lmFolK+l46WtiWrXNKhJWFlYnaEbyMK4Ct/mcwf8VoBVtGV+Z6EIdH+HZLmyX ZJDyFaH3FhwQTTuVXARsAGTWFvxcQdjUxvA6JeeZiUWo28xraawUuSAy5rAyF6m4wXUV plLIC/qnWwYgcCXfFofX8jec/fBTttfdrJNHS9upYkagJT1cHhedfITcH1AQSXzKYWKa tyaMKzJigX7QFms1J2CTZFEdMc0Uu+WeZjgLPD2kn1dzRDhuMbVlu0ptjq1VPaj56wpW DBrQZwFo7ZV9QFvhFHG5KW+OvkeVaMUynVzp6qVYaMBwwIFLSkp93dFfjVPw4ObiQoeH MQkQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=R53m7u7m; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b="ftP/PJt0"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=gOHqDFk9; dkim=neutral (body hash did not verify) header.i=@mandelbit.com header.s=MBO0001 header.b=BI3CQXJa; 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-43a471b3e3dsi330243fac.75.2026.05.15.01.01.06 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 May 2026 01:01:07 -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=R53m7u7m; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b="ftP/PJt0"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=gOHqDFk9; dkim=neutral (body hash did not verify) header.i=@mandelbit.com header.s=MBO0001 header.b=BI3CQXJa; 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=25pQApcavnenr2SjISxviX2fRH8J0rdWa9dbQ/rQHvM=; b=R53m7u7moC9rIiaecvUtClKPfg 8F/gIqOUtfj5bG8snrRHZJbmCohcD8+bT2oD6E4uytnIlK11XmcBlRN62+kW1W50vkCjmTcQnhdgF mHYLkYfULPfSK2st50puYXC7rsYQbUwSS5ttWvwpjAmtDFq6RakjKIAedT7Pp0PFkoxE=; Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1wNnTc-0003Pq-Nl; Fri, 15 May 2026 08:00:57 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1wNnTI-0003Nl-LC for openvpn-devel@lists.sourceforge.net; Fri, 15 May 2026 08:00:38 +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=d76rEcHE3tYtW60oDBTdJATmKrdQoYP7brilIJyfz0w=; b=ftP/PJt0XjPMq2w+z30rRxdnc6 qui/jDi6B2neRm7KC1LE1nsZtnMzQ99XGAWs0YHIiMm5Rk6lB6xTI0DUv+k64AbjTGxTGpUa5dTAE bU2Dr3AUzVIZB4faDc7KPQfrypZ1bWsq7TY/XWiofEW/p/OEFFEa6j5rYTnujgqfxjo0=; 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=d76rEcHE3tYtW60oDBTdJATmKrdQoYP7brilIJyfz0w=; b=gOHqDFk9H8lKc72PTKZbYddSsl HdFmhYlndx9KQG2b9lMrwneL02cf0vLIP3U0g/3ko4Ig0HQrKNln+AaWsyGiQyV7oW3VTxua3xsKH gb5M9snK7wBEaSSFJVcyXWHNBC2Sf81Z27jsqiCMrb5rd8F1tOmW3tCSNx7zZ2YCHvIk=; Received: from mout-b-206.mailbox.org ([195.10.208.51]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1wNnTH-0004Df-FN for openvpn-devel@lists.sourceforge.net; Fri, 15 May 2026 08:00:37 +0000 Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.102]) (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-206.mailbox.org (Postfix) with ESMTPS id 4gH0464P21z9xSl; Fri, 15 May 2026 10:00:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mandelbit.com; s=MBO0001; t=1778832022; 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=d76rEcHE3tYtW60oDBTdJATmKrdQoYP7brilIJyfz0w=; b=BI3CQXJaCzn9SUIZ1/g/Gbc5RKKlTGjrNkpqF2HoT5pQSKnNHDPf8g/6oBYLiIpImC6+YB 5QY03OoprYK/+X361s2l5fEK0oZAE+thS1hcP+lm+PPlfKQAnVtTrDoLar49lCiIN5mwVG v9ndxvTOthtptEt10zviNg0QPZLlNP0xp4pVXWhXlje3c5AcPW6DNp4qms3gYFRzZnx/4o 2E09ZX9Bui7Lnu1lXx2SEArIlOzowOr5KZ/qNRrBAz5rnmsbwLvx5n4neBP+7jq5+u1fT3 cdUfWi/KxFBo74DLqY7+AMonfslIszcvREaXFfSlNV2cUg3eFsMJLxQ+D1IaaA== From: Ralf Lici To: openvpn-devel@lists.sourceforge.net Date: Fri, 15 May 2026 09:59:38 +0200 Message-ID: <20260515075941.102225-2-ralf@mandelbit.com> In-Reply-To: <20260515075941.102225-1-ralf@mandelbit.com> References: <20260515075941.102225-1-ralf@mandelbit.com> MIME-Version: 1.0 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_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_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 X-Headers-End: 1wNnTH-0004Df-FN Subject: [Openvpn-devel] [PATCH ovpn net-next 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?1865240613956590009?= X-GMAIL-MSGID: =?utf-8?q?1865240613956590009?= 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 are considered, and the shared TCP MSS option helper is used to update existing MSS options without increasing them. Signed-off-by: Ralf Lici --- Documentation/netlink/specs/ovpn.yaml | 12 ++++ drivers/net/ovpn/io.c | 87 +++++++++++++++++++++++++++ drivers/net/ovpn/netlink-gen.c | 9 ++- drivers/net/ovpn/netlink-gen.h | 6 +- drivers/net/ovpn/netlink.c | 15 +++++ drivers/net/ovpn/peer.h | 2 + include/uapi/linux/ovpn.h | 1 + 7 files changed, 126 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..32f77d889b32 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,6 +55,83 @@ 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 (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. */ @@ -74,6 +152,12 @@ 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 + */ + if (peer->mssfix) + ovpn_apply_mssfix(skb, peer->mssfix); + /* skb hash for transport packet no longer valid after decapsulation */ skb_clear_hash(skb); @@ -342,6 +426,9 @@ static void ovpn_send(struct ovpn_priv *ovpn, struct sk_buff *skb, * independently */ skb_list_walk_safe(skb, curr, next) { + if (peer->mssfix) + ovpn_apply_mssfix(curr, peer->mssfix); + 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..a9f494e52e32 100644 --- a/drivers/net/ovpn/netlink.c +++ b/drivers/net/ovpn/netlink.c @@ -283,6 +283,7 @@ static int ovpn_nl_peer_modify(struct ovpn_peer *peer, struct genl_info *info, void *local_ip = NULL; u32 interv, timeout; bool rehash = false; + u16 mssfix; int ret; spin_lock_bh(&peer->lock); @@ -311,6 +312,17 @@ 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]) { + 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"); + ret = -EINVAL; + goto err_unlock; + } + peer->mssfix = mssfix; + } + if (attrs[OVPN_A_PEER_VPN_IPV4]) { rehash = true; peer->vpn_addrs.ipv4.s_addr = @@ -582,6 +594,9 @@ 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; + if (peer->mssfix && nla_put_u16(skb, OVPN_A_PEER_MSSFIX, peer->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 Fri May 15 07:59:39 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralf Lici X-Patchwork-Id: 4948 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:a719:b0:84a:48f:a1fd with SMTP id hl25csp4386133mab; Fri, 15 May 2026 01:01:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AFNElJ8Vd1LW/cPmSOLviP5HNQQpt4nElsXaW8PVN5JKmhcnGIKIGnzwyHDHouMZKZWUv0Jju25+ndWwijM=@openvpn.net X-Received: by 2002:a05:6820:f012:b0:69b:56aa:1525 with SMTP id 006d021491bc7-69c940a22b4mr1748297eaf.0.1778832067328; Fri, 15 May 2026 01:01:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1778832067; cv=none; d=google.com; s=arc-20240605; b=DRtOn4eCtabHEUmhx+02NXPo0lx8Dfb/+LT/+Lam72qRqbiLrCyq6pO2wb+16j4iPE ngZzeDozFxwyjErN9t07HLDDcqpLbnhYBO2icHq4lekuHIa8Tut37+Y1tjxa55GDidX9 upkXmi1Eir7oXU8nIMzTT+rZUtxUkf18O8e93j2gau77GSTAiMCPlIeUHGzDIY65bBn6 9flgspRGZb98tQ/6cQLUiHeWRvOiK9dvn3vG93dA2FQwpppHn0KvZHarn1NNHUTQh+pX btCNPDLi5loaXD0ItfTngG78qQQSp5NRM+Vdwd+LCqKUiVTKb8TErx5/lR5MODdzWxN0 earw== 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=2Qr2Wu5iq+IHC5bs7pSjh39C+IXfqdIGEtDBrP0yNvc=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=SldwQFblvZ0GXhdxAyPohXENvxarmt4e/UElyYMaa5t/LYIn5hixYhdWhKF9X5MnkC sWieo8Eb1bVcsdRg2QmPjXVgon0Tm4S/smk7ZBtRtt5yNeP0Bv6/Jj95cGGTlxQ6Ql/F aiLDXhO6FwOIv+LvkOdegMYFNdVjVDQ39yjh0p/MgtPiC0m5dRUNPiRkuCfuID1NZ0EA RGXRb47734D6p+5uq/n3pvAzg64AyW0k4GVtsbnQIAsBdCgOI60dz/aiZBwuReBABZGh jl7R+eknPrpUmZA5lpcSIQY1R9/fBK6fg5YCk/5NaT/Wv4wdI6ym0g2NN+g6z6aR8yeR ML+A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=UnOKge5s; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=QEfkJKOx; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=AQ+z347A; dkim=neutral (body hash did not verify) header.i=@mandelbit.com header.s=MBO0001 header.b=yYxXXkej; 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 006d021491bc7-69d048e3269si583376eaf.43.2026.05.15.01.01.06 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 May 2026 01:01:07 -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=UnOKge5s; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=QEfkJKOx; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=AQ+z347A; dkim=neutral (body hash did not verify) header.i=@mandelbit.com header.s=MBO0001 header.b=yYxXXkej; 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=2Qr2Wu5iq+IHC5bs7pSjh39C+IXfqdIGEtDBrP0yNvc=; b=UnOKge5sQ43PvnLhGj7W4hFcYG nrKSqA+v9L8oMYhVJqLbutD0YakufvObEUIEPDvWLf0vAOg8mEd4wtP1IbmQu9A0nLr3iQ4U4vvAn 1DZRjomAPqhqYJsSvwEWh4CDYw+3vwC007ijTGXCOUvrkfyU7UEL10QLMnI7IMSXAMgE=; 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 1wNnTe-0006Vq-Si; Fri, 15 May 2026 08:00:58 +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 1wNnTa-0006Vb-1e for openvpn-devel@lists.sourceforge.net; Fri, 15 May 2026 08:00:54 +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=40y7XnMkkeXrf07K1VSPgkl2+LDrg9qNQQfiNfet+Rs=; b=QEfkJKOxjsgiG3fO1wGbWaxxyz tSGvtuhsM+tkhL1vPwKZzTv0HTCQ+MBNpMCX+UElRwt7dA9Y0Cglv404Z1B1PTwIJ7ijZdbRcTay5 TMo5h4SfP94K7SoYKLV1pNeiEk1al/GnGp/jJ952lvx37RYXns5d1XA7kNRVmtTPX1Kw=; 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=40y7XnMkkeXrf07K1VSPgkl2+LDrg9qNQQfiNfet+Rs=; b=AQ+z347A+RYqS6v2NwNsd8hnT6 dVDZ9+am823n8lof4uWSY1SiPR/uME1kxlfFZil8VoFZAaEWZ17DgJ0glX9Oy4ZEpeEPMfU4D/0Rj G9qm99SBmw4zJZdMiwSdf9rm+pU9+qGyC5MsSMvywQFcnW6EWUu+Y4paMpSCx2aO6WFk=; 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 1wNnTT-0004EK-Ij for openvpn-devel@lists.sourceforge.net; Fri, 15 May 2026 08:00:53 +0000 Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.102]) (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 4gH04K423LzB0bP; Fri, 15 May 2026 10:00:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mandelbit.com; s=MBO0001; t=1778832033; 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=40y7XnMkkeXrf07K1VSPgkl2+LDrg9qNQQfiNfet+Rs=; b=yYxXXkejhpV4DEiPgg0IldCmlTzIsk650IjBkY2DUkucFHWUIaQjIfQ9KzXdOtzDaJJd8A Y41dAL0C1M3NJSC6hy4/nzpRWxB2VioRwBt33a7Z7008BxKWZ5JXNpdK1aB9gRYdRLc4ft t1pPTdq7rNLsnvFKvBz3cAWr4etYoVu5KnHiEDXV2S4/hXOfMh90c6P53UYShNqH6I7WbC cR1OFD7nEPiKOPCXER4a0enkk0X+jt0938qRCSADaUy0989F7X9P/Nfy295SFGok9FAahG SzJjEjXp9yDTBJwI0KqpyVAlT2K2thyxnaIS4bbZcupUCFuqmJ45pnqEZlnj/Q== From: Ralf Lici To: openvpn-devel@lists.sourceforge.net Date: Fri, 15 May 2026 09:59:39 +0200 Message-ID: <20260515075941.102225-3-ralf@mandelbit.com> In-Reply-To: <20260515075941.102225-1-ralf@mandelbit.com> References: <20260515075941.102225-1-ralf@mandelbit.com> MIME-Version: 1.0 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: 1wNnTT-0004EK-Ij Subject: [Openvpn-devel] [PATCH ovpn net-next 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?1865240613621500504?= X-GMAIL-MSGID: =?utf-8?q?1865240613621500504?= 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 --- tools/testing/selftests/net/ovpn/ovpn-cli.c | 19 ++++- .../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, 89 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..ca992a7cee3d 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"); @@ -2307,7 +2313,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 +2335,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; + ovpn->mssfix = strtol(argv[6], NULL, 10); + if (errno == ERANGE || ovpn->mssfix < -1 || + ovpn->mssfix > UINT16_MAX) { + fprintf(stderr, "mssfix value out of range\n"); + return -1; + } break; case CMD_DEL_PEER: if (argc < 4) @@ -2442,6 +2456,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