From patchwork Wed Jan 28 12:44:08 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralf Lici X-Patchwork-Id: 4742 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:8468:b0:80a:3855:ce6a with SMTP id u8csp2719343max; Wed, 28 Jan 2026 05:07:14 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXrWBU443rqJxf0TeFq+6xZZQF2mx5fsrf395KAWUpHq3Vf4yhEydbcejp9BjuhEtnkYmGs4iFI7FQ=@openvpn.net X-Received: by 2002:a05:6830:4995:b0:7c7:55e3:9117 with SMTP id 46e09a7af769-7d1850fed40mr3046395a34.22.1769605634669; Wed, 28 Jan 2026 05:07:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1769605634; cv=none; d=google.com; s=arc-20240605; b=HbuELQvtEaFHv+4Lo3gPnWpQhs7iZPoItI9hdJa3QJyO8WRWyOHp4nHkloU9EP7DRy IIPXrhXQ9/sSzquKDavqMMGxqQ/tXp9Ro9jKbowxGrSNKmsmJm8sJTzRAPGLRDhbuHs4 tMyRhMLJBrRoNBXqNMvFVuHF5/73lmLd07EOJz3awx/BkAZFQUxASsvrRKmu80ACJpNw 5dcPbSZJc2/nbZDYOhDXzYQUEI4dyxVTPvreMEVABbfai4huK1Eo6lQADiLjqWjzYuw3 ke88Wf0rsHp9+XC7zJMJKTDccf4TDf7Z2WMST+Oh+sZNrFK1IgEZn7tXRheF59r39nH/ x93g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:content-transfer-encoding:cc: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=YzVK+uCeVfiqayny94NhVOzWki1ZmZcZ3qESIiv5Et0=; fh=bDmbXayvKcQuWZaaz4JM7kgnS3MJBk3QUq2ehqNuBVc=; b=d2PCsEFtQKTdELC9grJ57eKK8UpYKYwTcacWdmDgoHEvGI3XxH1QU56DSAEuDC5JVi 4a0Kiq7hjmoD8k3msBPmrBVNZ+KfB8OfZyLjuc3puKfunP/xpBKN1zf58Du5Xy1lXvqL 8lDtRq57uhUFb6m5uxefPj8Orp+OPUSGDsHKHPv0wmV+fLnJcRZOmP6AGKG3lgQJSrYB g3m6ihFVjzB5bR6ecm9qBzBSCTMiw+egnJZPrBDLW5jxefn6Nb0fCBUSAWVUPZyyMqYN k200M5ZI/oiYVhGv8y7miDQx6dRDy2GP6lIkIcHgupz13OTlmtDsPnnJyzv5Mmstz/NB w8Vw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=bHIv4Nzw; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=m0vaAKM1; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=NHFXLqKb; dkim=neutral (body hash did not verify) header.i=@mandelbit.com header.s=google header.b=TstIaI+4; 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; dara=neutral header.i=@openvpn.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 46e09a7af769-7d18c4e7fcdsi1454427a34.0.2026.01.28.05.07.14 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Jan 2026 05:07:14 -0800 (PST) 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=bHIv4Nzw; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=m0vaAKM1; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=NHFXLqKb; dkim=neutral (body hash did not verify) header.i=@mandelbit.com header.s=google header.b=TstIaI+4; 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; dara=neutral header.i=@openvpn.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:Cc: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Subject:MIME-Version:Message-ID:Date:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=YzVK+uCeVfiqayny94NhVOzWki1ZmZcZ3qESIiv5Et0=; b=bHIv4NzwYLlSJGylEqxwqowJCp MXpuEyOgaQteUuBuN4rjakOXpYJPLsAgfXnmkWfQIAzEIssvlr61If5pea/N5/c7Yw9fft5wnH29I JxUyTZBBQF/dBgu46EyYK5pBl8zVQtK70Kj6lcVuZrQaAFSFoGz3fRuXdKRt4A9v+UdE=; 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 1vl5GF-0001pT-Be; Wed, 28 Jan 2026 13:07:08 +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 1vl5G2-0001oH-GN for openvpn-devel@lists.sourceforge.net; Wed, 28 Jan 2026 13:06:55 +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=PEXvWO05RJ+Ry2EvIf+WQoAYB3QOSfR8WrzIemR6Z3c=; b=m0vaAKM1DN5eSvZgxpWsrTuvyX 0lAVdyCwvHapjHgGkerkZE3Dkbua3Ocr9tWAH9ysdVsMONs/N6SuGjetxpxtcpBcx9Y6TBn3Hrmp5 pjn1kVCmvxfBia1AwWWuEcQk0AxmA3Mx4Ns3mg3tYalQ8a2Plhe1rkB4i8Rf3zyf0L2s=; 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=PEXvWO05RJ+Ry2EvIf+WQoAYB3QOSfR8WrzIemR6Z3c=; b=N HFXLqKbHAORiir58rQ2aaCxokhXVOJszFTEZEe2jZlxcrouom9jPXLQs4BNl1DTCEYigZoxLA6Sxd pSd8ho2Yi4wdi7qQ6mIGpI0/cmfjvpdfamvz5U42oOYqUWUZOnh16NWmxhJnmlm9T/i8sJzuRiWWx 7Xboo0Fg+hb2rr6g=; Received: from mail-lj1-f180.google.com ([209.85.208.180]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1vl5G2-0006Qk-MK for openvpn-devel@lists.sourceforge.net; Wed, 28 Jan 2026 13:06:55 +0000 Received: by mail-lj1-f180.google.com with SMTP id 38308e7fff4ca-382f9211cbfso60867121fa.0 for ; Wed, 28 Jan 2026 05:06:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mandelbit.com; s=google; t=1769605603; x=1770210403; darn=lists.sourceforge.net; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=PEXvWO05RJ+Ry2EvIf+WQoAYB3QOSfR8WrzIemR6Z3c=; b=TstIaI+4HelpqEf7XUut4vEo+fuHDw2ciUmk9vsTRb+jH+2KrR0UbwAF392NGPE4Gu D8kzqD0fci3+CE9dBCcXXH74WnYehkVjpdrR0mVSqfX+ZyC4uivYWhCoBsfKYOeJSM/9 z6k/4JIBLPuBlRIyQxWo9niaGW1cZq8hiIfMby5gdSWeSZLuOJaVILv2JEhpwUoqUm1n AptbWIrdj49dgV8JwelAldbcsxjjEhlVsQJx9mqtwLB4hecaPjtAXZYppwrO+4MNO3sf T1nFaj1dZ/pL1uyS6x6sF19kOuW4huXXMgJHBDbLNB/D3RzyA6AdSgD196zrIpC3UfM9 R6vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769605603; x=1770210403; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=PEXvWO05RJ+Ry2EvIf+WQoAYB3QOSfR8WrzIemR6Z3c=; b=irE9QabVrma4yIDLm8n4/svdkH8cqSpIhxxfUPCbzpyDcVBujzZVhVxj/fz//UulNl e49u5LTnClezoZAsDhtUd7duYbeoT/eMngCyqXpnR876femnaf6auW+i20VwF9eaLAGU FWk1XwSZ8tWKxefdIXmk7gc/KcPA8NmuQF/Ndgay9nIjOpTUxrfqca59TuuooaqP8lU7 bmVrcQJmfnM8OUwEiDqsrgqlWVxXy86GzIE7pCRzRRYEteNCpp4G94qjG3n5tjtSUbpl ZI8Up1LM57SaqzYcyoN04OFHg3sedS4OFqYgOKE+b/J7NBQnZYomxdhdbcNtmcg5dGNp 0vBQ== X-Gm-Message-State: AOJu0Yxt+Bdbka29T3mbcL+4iMhkWhqmva7h0O9P3Dv4aRkSu2LgLBSI ARhveVDrq8M67QygdvmxRIxBkYyT51yChlYcupBlmT9KYIF92yWyW/iwfXuvBZaC3dB2im541vw 2w3Y+ X-Gm-Gg: AZuq6aJUu1Zp2VOB3aJ6SQGcbwjMUuN7LG/TBxhWJY9c/jr3uSZ1yCG0V6k91yMcNpP 5tgMGrNwdsBceHINQUUDhwXQsmArl4fvQfNZ1bulWk5iZWZ8qeWB+ZkTST51CYI8i2hlI1qNEp9 JkyrNSWkVkvYjxn0d/W+ABHzJM6zEw1v6jXCpc0eE0bA5geY/NksOkvi8QpOqW/YFzAIX5O+OeQ 0Q2N8suzxdYbE5KzMbIyA1TB9c7Ue4x4qlTQKe7/McxuGMNOErx0A2hSp+k88FTmxGUCw1noEGI tYsEtOb0U0qg5GyfaYJKzYNj/mNCBmCLtYSgp4OAoDKOdOHIkC1ahfkcybTVDZlmjbL1ZJMtzs2 QeNldqo+PHlOjHZHpYemTsfUveMVbqOTo//IiOveFltR1EfmqMYXZJE4ge4Bq990Dje1i8m00d6 0BuSQnlw== X-Received: by 2002:a05:6000:2310:b0:435:9770:9ecb with SMTP id ffacd0b85a97d-435dd1cd9d7mr7574231f8f.56.1769604268721; Wed, 28 Jan 2026 04:44:28 -0800 (PST) Received: from fedora ([2a01:e11:600c:d1a0:3dc8:57d2:efb7:51a8]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-435e1323034sm6656742f8f.35.2026.01.28.04.44.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jan 2026 04:44:28 -0800 (PST) From: Ralf Lici To: openvpn-devel@lists.sourceforge.net Date: Wed, 28 Jan 2026 13:44:08 +0100 Message-ID: <20260128124410.429529-1-ralf@mandelbit.com> X-Mailer: git-send-email 2.52.0 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: During initialization, we override socket callbacks and set sk_user_data to an ovpn_socket instance. Currently, these two operations are decoupled: callbacks are overridden before sk_user_data is set. [...] 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_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.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.180 listed in wl.mailspike.net] X-Headers-End: 1vl5G2-0006Qk-MK Subject: [Openvpn-devel] [PATCH ovpn net v2 1/3] ovpn: set sk_user_data before overriding callbacks 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: , Cc: Sabrina Dubroca Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1855565998254579644?= X-GMAIL-MSGID: =?utf-8?q?1855565998254579644?= During initialization, we override socket callbacks and set sk_user_data to an ovpn_socket instance. Currently, these two operations are decoupled: callbacks are overridden before sk_user_data is set. While existing callbacks perform safety checks for NULL or non-ovpn sk_user_data, this condition causes a "half-formed" state where valid packets arriving during attachment trigger error logs (e.g., "invoked on non ovpn socket"). Set sk_user_data before overriding the callbacks so that it can be accessed safely from them. Since we already check that the socket has no sk_user_data before setting it, this remains safe even if an interrupt accesses the socket after sk_user_data is set but before the callbacks are overridden. This also requires initializing all protocol-specific fields (such as tcp_tx_work and peer links) before calling ovpn_socket_attach, ensuring the ovpn_socket is fully formed before it becomes visible to any callback. Fixes: f6226ae7a0cd ("ovpn: introduce the ovpn_socket object") Signed-off-by: Ralf Lici --- Changes since v1: - reset sk_user_data to NULL in case of error - removed a redundant goto sock_release in ovpn_socket_new - expanded commit message with additional information on the purpose of this change - added explanation in the commit message of why the per-protocol ovpn_sock initialization code in ovpn_socket_new was moved - added Fixes tag drivers/net/ovpn/socket.c | 39 +++++++++++++++++++++------------------ drivers/net/ovpn/tcp.c | 9 +++++++-- drivers/net/ovpn/udp.c | 1 + 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/drivers/net/ovpn/socket.c b/drivers/net/ovpn/socket.c index 9750871ab65c..448cee3b3f9f 100644 --- a/drivers/net/ovpn/socket.c +++ b/drivers/net/ovpn/socket.c @@ -200,6 +200,22 @@ struct ovpn_socket *ovpn_socket_new(struct socket *sock, struct ovpn_peer *peer) ovpn_sock->sk = sk; kref_init(&ovpn_sock->refcount); + /* TCP sockets are per-peer, therefore they are linked to their unique + * peer + */ + if (sk->sk_protocol == IPPROTO_TCP) { + INIT_WORK(&ovpn_sock->tcp_tx_work, ovpn_tcp_tx_work); + ovpn_sock->peer = peer; + ovpn_peer_hold(peer); + } else if (sk->sk_protocol == IPPROTO_UDP) { + /* in UDP we only link the ovpn instance since the socket is + * shared among multiple peers + */ + ovpn_sock->ovpn = peer->ovpn; + netdev_hold(peer->ovpn->dev, &ovpn_sock->dev_tracker, + GFP_KERNEL); + } + /* the newly created ovpn_socket is holding reference to sk, * therefore we increase its refcounter. * @@ -212,29 +228,16 @@ struct ovpn_socket *ovpn_socket_new(struct socket *sock, struct ovpn_peer *peer) ret = ovpn_socket_attach(ovpn_sock, sock, peer); if (ret < 0) { + if (sk->sk_protocol == IPPROTO_TCP) + ovpn_peer_put(peer); + else if (sk->sk_protocol == IPPROTO_UDP) + netdev_put(peer->ovpn->dev, &ovpn_sock->dev_tracker); + sock_put(sk); kfree(ovpn_sock); ovpn_sock = ERR_PTR(ret); - goto sock_release; - } - - /* TCP sockets are per-peer, therefore they are linked to their unique - * peer - */ - if (sk->sk_protocol == IPPROTO_TCP) { - INIT_WORK(&ovpn_sock->tcp_tx_work, ovpn_tcp_tx_work); - ovpn_sock->peer = peer; - ovpn_peer_hold(peer); - } else if (sk->sk_protocol == IPPROTO_UDP) { - /* in UDP we only link the ovpn instance since the socket is - * shared among multiple peers - */ - ovpn_sock->ovpn = peer->ovpn; - netdev_hold(peer->ovpn->dev, &ovpn_sock->dev_tracker, - GFP_KERNEL); } - rcu_assign_sk_user_data(sk, ovpn_sock); sock_release: release_sock(sk); return ovpn_sock; diff --git a/drivers/net/ovpn/tcp.c b/drivers/net/ovpn/tcp.c index 0d7f30360d87..f0b4e07ba924 100644 --- a/drivers/net/ovpn/tcp.c +++ b/drivers/net/ovpn/tcp.c @@ -487,6 +487,7 @@ int ovpn_tcp_socket_attach(struct ovpn_socket *ovpn_sock, /* make sure no pre-existing encapsulation handler exists */ if (ovpn_sock->sk->sk_user_data) return -EBUSY; + rcu_assign_sk_user_data(ovpn_sock->sk, ovpn_sock); /* only a fully connected socket is expected. Connection should be * handled in userspace @@ -495,13 +496,14 @@ int ovpn_tcp_socket_attach(struct ovpn_socket *ovpn_sock, net_err_ratelimited("%s: provided TCP socket is not in ESTABLISHED state: %d\n", netdev_name(peer->ovpn->dev), ovpn_sock->sk->sk_state); - return -EINVAL; + ret = -EINVAL; + goto err; } ret = strp_init(&peer->tcp.strp, ovpn_sock->sk, &cb); if (ret < 0) { DEBUG_NET_WARN_ON_ONCE(1); - return ret; + goto err; } INIT_WORK(&peer->tcp.defer_del_work, ovpn_tcp_peer_del_work); @@ -536,6 +538,9 @@ int ovpn_tcp_socket_attach(struct ovpn_socket *ovpn_sock, strp_check_rcv(&peer->tcp.strp); return 0; +err: + rcu_assign_sk_user_data(ovpn_sock->sk, NULL); + return ret; } static void ovpn_tcp_close(struct sock *sk, long timeout) diff --git a/drivers/net/ovpn/udp.c b/drivers/net/ovpn/udp.c index d6a0f7a0b75d..272b535ecaad 100644 --- a/drivers/net/ovpn/udp.c +++ b/drivers/net/ovpn/udp.c @@ -386,6 +386,7 @@ int ovpn_udp_socket_attach(struct ovpn_socket *ovpn_sock, struct socket *sock, struct ovpn_priv *ovpn) { struct udp_tunnel_sock_cfg cfg = { + .sk_user_data = ovpn_sock, .encap_type = UDP_ENCAP_OVPNINUDP, .encap_rcv = ovpn_udp_encap_recv, .encap_destroy = ovpn_udp_encap_destroy,