From patchwork Wed Jul 29 12:01:31 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralf Lici X-Patchwork-Id: 5172 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:fd0b:b0:87d:ab56:3700 with SMTP id cw11csp1858662mac; Wed, 29 Jul 2026 05:11:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AHgh+Rp+tdnPbGsdpcDnXM9YvlE4ggUXwGHdoXrGS78hHdSAfjqjsE+9ygsq0vJUFRBUzeZ/qsmmdGtPaSg=@openvpn.net X-Received: by 2002:a05:6830:6aa5:b0:7e6:ef1d:4aeb with SMTP id 46e09a7af769-7efff0bac15mr4095542a34.15.1785327084137; Wed, 29 Jul 2026 05:11:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1785327084; cv=none; d=google.com; s=arc-20260327; b=GbTyvJkfQTQxKu6JMBBDyoOgjhr/nFzMjVf2nmSQpJkfFULTCzJiZHl/roH1aFmgIH z7vce1Nf6DxgCIctDvAAm9pDft0Eyagf77Bc92BDy+kCziswI5P1481DCcJUyOT4M3zu Vo/2grTY8AhNjo44seh4PusFSFxIo/DTxD+zXAMmrIKe6b5cRj7aOFuj49rUV4NgBw2v 1l5RcWdCLtDb5I56PZOnDO+itTiQQZEVIW2Ny3TdU78tDpHFfzAw3IfrWG0Yb7MeMiYq Ac+C0m8uL7SR8B99Tiis/NCCbochIJSy042yTUtG4vaTWVR7efxmsLQ79twUyqMUTjiv EkYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; 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=/x3u79vq4dxa6H7Nl/CvnLwe1HRi86IrLuO/mkkqzNQ=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=Zpd7UtL/PZoE3AeDf876L7Os4dGO2C8UsWreyKOnbwE1W9HkAgJDcjf41PCEUs9VXu a/PCrJ370arivyqQzj63egT4n7n2Q619XTM4yIxG7Xx0kh6csbd7W1CxXYh5Y4qa/Eiy iX6wScYqFymJTte5OPJ9fIZyTsoVheT82VgmAzKiApZQN4LhHR49uU6u+wrEDf75TGLe awzeLjEDYQPzTK8fbNnaa3LJgPUxMeuwURrQmXDfR7H2VkYtc9BZ+/2l44r++68vY37C 7bWD0vpQvYlyYxthzNTlF5ULCbgZQ+BsGIzxlhTatf1JWbXpjxrR3d/x2AZMl1e8alG6 LyEA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=JqnBTHoF; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=M19OtkMQ; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=LpYTv5gr; dkim=neutral (body hash did not verify) header.i=@mandelbit.com header.s=MBO0001 header.b=Ira0omka; 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 46e09a7af769-7f00da78757si2080199a34.118.2026.07.29.05.11.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Jul 2026 05:11:23 -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=JqnBTHoF; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=M19OtkMQ; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=LpYTv5gr; dkim=neutral (body hash did not verify) header.i=@mandelbit.com header.s=MBO0001 header.b=Ira0omka; 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=/x3u79vq4dxa6H7Nl/CvnLwe1HRi86IrLuO/mkkqzNQ=; b=JqnBTHoF6wRKLOSEUXE55eYTnJ FdqtbrGpf47SQ2mI90vCqip+QSj0/+RyKSI0QdSocTLX+IhA694FEccewaUYjrbdKznS6iN1CNy6j qTSSmHuKTSmlf3XNPZsVFp/qeLvZJrQPsFzpD1cKhk3iYhEDxuNz0UKZUaJwVfHofNL8=; 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 1wp383-0000Iz-OS; Wed, 29 Jul 2026 12:11:20 +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 1wp381-0000Ie-2Q for openvpn-devel@lists.sourceforge.net; Wed, 29 Jul 2026 12:11:19 +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=1OjE3bgCHfNTM2NLK5OCTfl75MbZ4k/Cwc3YvLfVYAg=; b=M19OtkMQblXbmWxb6jXpnajrIS /qTOYdKSNk6RSKhFB96FfHzGhVtRDPibFVkZrjMUpSXr8bDuJENunZokiLrPvGa3BnxXmtMJC/Y0f JJcA0Ir6SxuwG5HJf0zUKsKElbRUcHTrEiD0Pflqf5qOoEVIt9MH6Dmm5dz5DRXZYS0Y=; 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=1OjE3bgCHfNTM2NLK5OCTfl75MbZ4k/Cwc3YvLfVYAg=; b=L pYTv5grtj4HHwHLgFbiAF3HCqtAnDuYHUabxV8YPSBIjO9O3lYFKguYYw1f2PvHsg5B+RMtm/j2EE lKCl5F9dNOFexosv/H+0xTGHfejgHIojRU/7ViiIaShU3bTiDruFFun8KVpYwlLg4J+cJLCCp6IxE l4XIxBQ01IbmCX9E=; 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 1wp37x-00062u-L2 for openvpn-devel@lists.sourceforge.net; Wed, 29 Jul 2026 12:11:17 +0000 Received: from smtp2.mailbox.org (unknown [10.196.197.2]) (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 4h99t55PwMzFrC5; Wed, 29 Jul 2026 14:01:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mandelbit.com; s=MBO0001; t=1785326509; 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=1OjE3bgCHfNTM2NLK5OCTfl75MbZ4k/Cwc3YvLfVYAg=; b=Ira0omkairAhODD3+d/ZwkGObe7SfWp/+GrWldFU10DeOFx73uhbzZ4DL+OIhCfaL9sIIJ dmaVxfJxj1Azlo9YX6dO6S9MLd/UJP7rmnPNPRC4/f6phN/XGOH/xcDoyv97RybYr/GibL ON4syYHjX/VSo7ZM8MtrjO7lXMqUUaOaA3ZBs8EoXyKPSIS0SVj7PawVEs1IaOkUVoDfo6 7X/Dnatp6Fi7AZMRB6DkYbC0Ln5zXu7rtDzAHb80xzJjRYj34YC23Ey1pMk+Ui6GpwbE4J m8WbVuOkjy7hiPPXlgaNxSSdBgbyzY7GNym35pTgLW9ZqrENiSWWIPxjXVMV2Q== From: Ralf Lici To: openvpn-devel@lists.sourceforge.net Date: Wed, 29 Jul 2026 14:01:31 +0200 Message-ID: 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: ovpn hands encrypted data packets to udp_tunnel_xmit_skb for UDP transport transmission. At that point skb->data points at the encrypted OpenVPN packet, but the skb may still carry inner-header metada [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -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 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-Headers-End: 1wp37x-00062u-L2 Subject: [Openvpn-devel] [PATCH ovpn net] ovpn: fix UDP TX byte accounting 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: 1872051132293161979 X-GMAIL-MSGID: 1872051132293161979 ovpn hands encrypted data packets to udp_tunnel_xmit_skb for UDP transport transmission. At that point skb->data points at the encrypted OpenVPN packet, but the skb may still carry inner-header metadata inherited from the plaintext packet. The UDP tunnel output path uses skb_inner_network_offset to compute the packet length passed to iptunnel_xmit_stats. If the inner network header still points at the pre-encryption payload, the ovpn netdev TX byte counter does not account the OpenVPN data-channel header and authentication tag. Reset the inner network header before handing the skb to the UDP tunnel helpers, so the encrypted OpenVPN packet is accounted as the UDP tunnel payload. Fixes: 08857b5ec5d9 ("ovpn: implement basic TX path (UDP)") Signed-off-by: Ralf Lici --- drivers/net/ovpn/udp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ovpn/udp.c b/drivers/net/ovpn/udp.c index 7f69e8890b5b..48172bd073a9 100644 --- a/drivers/net/ovpn/udp.c +++ b/drivers/net/ovpn/udp.c @@ -342,6 +342,9 @@ void ovpn_udp_send_skb(struct ovpn_peer *peer, struct sock *sk, { int ret; + /* the encrypted openvpn packet is the UDP tunnel payload */ + skb_reset_inner_network_header(skb); + skb->dev = peer->ovpn->dev; skb->mark = READ_ONCE(sk->sk_mark); /* no checksum performed at this layer */