From patchwork Fri Jan 30 17:32:48 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralf Lici X-Patchwork-Id: 4746 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:6911:b0:80a:3855:ce6a with SMTP id o17csp349948map; Fri, 30 Jan 2026 09:33:45 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXNkcv4r5GYv9iK6+9jCAGNA41xh0e/I+sQ1WpOtRfZZoAUv4mjHHQNFR8Be5ZQeWm0jF/nY9gUz3g=@openvpn.net X-Received: by 2002:a05:6820:4cc7:b0:662:6b87:f95f with SMTP id 006d021491bc7-6630f3ab507mr1381379eaf.74.1769794425802; Fri, 30 Jan 2026 09:33:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1769794425; cv=none; d=google.com; s=arc-20240605; b=N/kl4GW6LvYkufwcc3FXiLbdMHg/X4mR5Cu9DyE7QodidzsoUeQ4KDYbDNgEf0G8Rr KyO7/mJCDd5/Mdoe/bjK/b4DKITEMDSKhUww29Bmm9NEUF9p0D1GCZoBnykSJSI+7O4Q K33F4uC06y38S2j/lWfeUOPCrhij5KvWzJI1Zwlkqqb/xdRY4rsrboz0dsAhU8PS7pGG ZFEQ4epvw5GY8sYlIS5IgZ3tqH0OKJtdyPxUuJ7bm2+/ixkgTZ/maXnGqi+kp+7l9jW9 IQVcbD31Va5HDB05AD8JuM4i5ziI5TakXaS8kq0AfMwUPdJSABz6i2+E3XAm44FDJ3me 6ilg== 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=hPSBQBZSt5klGdz7cRl8OCtMmE4AApl+iYyOYsrzzwI=; fh=bDmbXayvKcQuWZaaz4JM7kgnS3MJBk3QUq2ehqNuBVc=; b=NtAknOwI8EYr8SQw7hL9AYmJnZZGdc93gUsnNXzF3muwA6s6Rzkn+e2+23UK/dhGiB 0Bc9VdUD7VOYRTDlqhx7HrY1krHIijg560/2nnmVN0/iPdOdMcMOeWaae3M5yCk3A2ji tovZx/fumDzWjwvfWxauhjOqkk+Z3Lvy23zlCk+787SycNWiOCtQIblVmQOHrdt4jPE9 1vYTEcq4eY7ytT+shGyb/aQAgaqffPiCFfBKWy+P+6GPhASSbTMZTKX/AvCewNTIbUql kA31T0QxRA+BcU454XoEnxK/b3R+5JDwlozY8RN2inquJUXWCm2k2WveV+6SR6d8fx5F pjig==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=M2OYyRX0; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=MV6eZ7SY; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=AWxqyruN; dkim=neutral (body hash did not verify) header.i=@mandelbit.com header.s=google header.b=gOBrvGqM; 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 006d021491bc7-662f9a3a72bsi4823144eaf.50.2026.01.30.09.33.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Jan 2026 09:33:45 -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=M2OYyRX0; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=MV6eZ7SY; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=AWxqyruN; dkim=neutral (body hash did not verify) header.i=@mandelbit.com header.s=google header.b=gOBrvGqM; 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=hPSBQBZSt5klGdz7cRl8OCtMmE4AApl+iYyOYsrzzwI=; b=M2OYyRX0OK4Zan7aYdW3Xbxbzr o5rjNiHx/Zn7fmpWStPHvWcTA4DUq5lg3ClPBlVuNaeJhMqmNge6pPVcgUuugY6nNH8Sbl5P/rCDr Y10dqCvE3XddkfJOyhMeL5I3ii3Ck5cpplJia+0yvXnFyDITSVq27KAuKU5gJUFLCvOk=; 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 1vlsNF-0007rQ-1h; Fri, 30 Jan 2026 17:33:37 +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 1vlsND-0007rB-BM for openvpn-devel@lists.sourceforge.net; Fri, 30 Jan 2026 17:33:36 +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=v3ZhN7qavq8wkpyYQxQPENjsapaMNszGu4MC113bZq4=; b=MV6eZ7SYbJkE0cUcARDykWoXIM hfhwEZrUHDnJm8kaO9h26Lcx49Ztzz/MGrlYoWux6J8oYyzVce8THYLscFxmyeD/2+/kHnTEJY4DG obObwnunXmb6zBQcSPAKGpL3dLiJDck4ZcpjU/uNJ6jEy/y7KzWcUDePmlgC5dFTTesM=; 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=v3ZhN7qavq8wkpyYQxQPENjsapaMNszGu4MC113bZq4=; b=A WxqyruNe+89vssIx7z5xowmGs9jfyGSCtd4jzNUpmdbYK6x9OgoJClxty978tsF/ncoLZPVhHsSlL +fmgININEtAxYYZ6pkLNluOklyl6s8ll9BsfXTsXc7nKKQwtgupUoJkUXtzm23m+ZClo9tB8Shnfr 0sK+f0KkLanRwnCI=; Received: from mail-wm1-f46.google.com ([209.85.128.46]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1vlsND-0006Ha-C0 for openvpn-devel@lists.sourceforge.net; Fri, 30 Jan 2026 17:33:36 +0000 Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4806bf03573so13047525e9.2 for ; Fri, 30 Jan 2026 09:33:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mandelbit.com; s=google; t=1769794408; x=1770399208; 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=v3ZhN7qavq8wkpyYQxQPENjsapaMNszGu4MC113bZq4=; b=gOBrvGqM8KP7cG6JWuExBc9bPYtTP8tTbIlY9gPuHu5Jv/4GDh5vWOFJYNxos0q9wb EcszxBL8Cq8U29lY4EgV3AC9JiRFR1cW/SkhEdODxLLdKHWzb6fB2FYWol1elMy9rsvT mJFShSLBzwpyUqMUBcsJ7tU2mumk40c2a9VO3o5zEzhyg1ARVwr5t9G4aarw5zZj6Gcj ZBV9EFf18bSjHFblZr2U9MvAC3ekuCOkEoI7y72C88Byr74u52bWTYbPVnSnwfrRqpdR RJTQiCKOtbIkCBxonmSfnqmJLt9RadUf5AYyhimaapq87d+tRhH5nlnWUAmjS0hEeOEo dRlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769794408; x=1770399208; 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=v3ZhN7qavq8wkpyYQxQPENjsapaMNszGu4MC113bZq4=; b=ljda5Z+bEUYP/BLLgeheQaxPiUefxf5plCCCyDIHpuYl6aIus3ShE1dVSn8sEWrbIs x5eZzPioELVcLwUQ64YB+g578Jn2o8T+j5b7ear3rvIhzFK93G5SL8uxDMSmM/jG5Nbo MZIJ6Nt494bwGMP3s0sgXMEZhX/ISgXQe/l26Cz48xbmFfgb5mctuY7478f5EHJRcCje Bb9hFgm+60Xzb7jHIoOi+DhKDt+CpA/ZKHyzC3Ohdt0/EI5dLsTXpQwdvRk5PjkdKbsf vfinUzCfhtT12GdnDH9sczrxOHlRR2fh/hENK5xJxXUxEjAcJDAMHYsje3Hscf/F84/7 MRiw== X-Gm-Message-State: AOJu0YwzfA+sMszBrkNyyYjFN13oDtpdNPccgRB8I/ew7QJsKj0Uuw1m xtXrnWLk4Vj6MjvbCdzz5eKhfagND1tYa5OVkQUF3sGXac5wLOxG7spxArYA9/w/QhxC/HbV6Cl ufFD7 X-Gm-Gg: AZuq6aJzPU2fhUsfIx6zpA+AII9S5w7D/ca2tA8/fJMHfJqtb8uDiQ0HSbEOmL0d6dY Da++5Is3IWBYFeRwe/xg+sku0qwpozyy0u+bAcrj0unRp8/AiFYlvQstA7e1Xbx8jdxluR111ku 7pWPqLAIO/nFfZwqssteEYMpQi5WnNohwocCtUxND59tFoh/mkcTYKa+RnaqV3sRoyMH5e+A7SO av0SF/gcJGniX1XfkIga/1pWKvGUbevnodFeWQVBvcHpriUUFdvj3VLJxWMTuYv4cpDmo1+NAJr 79uSGEXb/OMK9LPFZHd7podR9OSWHmtLgqjUJLWedO20zyZSMb9w+LOr86V936BH0OO1zaQ73Iy KK9WevIHqIFp/1xfuyi2lCWAVss0B93v4D9BlWHYFT9e/9kaPXUaKVLlmdm+WfR/s181ox+IbrK zf7kEJLGXVnNLo6Mnw X-Received: by 2002:a05:600c:8b27:b0:480:1c85:88bf with SMTP id 5b1f17b1804b1-482db4998ddmr38926025e9.27.1769794408093; Fri, 30 Jan 2026 09:33:28 -0800 (PST) Received: from fedora ([2a01:e11:600c:d1a0:3dc8:57d2:efb7:51a8]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-482e047d863sm22090605e9.1.2026.01.30.09.33.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jan 2026 09:33:27 -0800 (PST) From: Ralf Lici To: openvpn-devel@lists.sourceforge.net Date: Fri, 30 Jan 2026 18:32:48 +0100 Message-ID: <20260130173250.664943-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 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.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) [209.85.128.46 listed in wl.mailspike.net] X-Headers-End: 1vlsND-0006Ha-C0 Subject: [Openvpn-devel] [PATCH ovpn net v3 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?1855763959851019689?= X-GMAIL-MSGID: =?utf-8?q?1855763959851019689?= 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 Reviewed-by: Sabrina Dubroca --- Changes since v2: none 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,