Message ID | 20250604131158.1417342-1-ralf@mandelbit.com |
---|---|
State | New |
Headers | show
Return-Path: <openvpn-devel-bounces@lists.sourceforge.net> Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:441a:b0:667:f736:4f3c with SMTP id u26csp260846mae; Wed, 4 Jun 2025 06:42:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXJnKzyIldsifYDZJmG1Fb4Pq0jfVaV4mIIzLl2jN/qmBHcjUTWXLBF8fvMlqC7zbbLxrpYbk4ZGZM=@openvpn.net X-Google-Smtp-Source: AGHT+IGq5LRnafXQz1yff3EwMzLsaZtzk074p/miuP+FazHdh/NVr/nL1JDYOXu7JZ8HrP0sXTej X-Received: by 2002:a05:6e02:144b:b0:3dd:b5c6:4225 with SMTP id e9e14a558f8ab-3ddbed0947amr28033115ab.6.1749044554301; Wed, 04 Jun 2025 06:42:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1749044554; cv=none; d=google.com; s=arc-20240605; b=VmnbM951TvVfM7IqyMwUtfQUdBTdHV4C17Eaad/FKuTSK6mnbhbShkxHqYvyVb6Saq AqdNBAFnuLKZXKIpJ68+Sjx4Q2fJUpjbVqVaflzfVd4DVgcbto+Czr+W5NguJLn4PMJw Jm1cVdu/JfHGxs0s6jRTvjWyEwo3lTYw5F8rVw3UqdwGiiXYHM5cSr2oFwybYNvbJSh8 /siSku0E1NtCCc9Z1ecUOKBfPmfkFHNhLnVjydUSdbyKrmLL0HaoDjvfZEwE2Je/Vl33 7M1gip/y1yjLdxC7E0KglJkyDEx7U7R42kIrCaTRTsKUMqrT+Dp2w37Wo/MYGwCcFdS5 5Bvw== 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=ciMkxArQrGRAcT1bmPR/DMPomOzOmqTJdWRh5jkiPVM=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=BYrQTIX+zTBu7FwWPYlwSzoC8FsKRBoMS0TI98ZXzWSV9OH/zeeKd0rUW7V7muuRRr 87/kFmBh1WqY5JkTot+sSb037YDYL4faN2U2GLWQ+T7YMbEolEz6iMABea2N+1s30LHo dt5S4T2+Txv/npIQd7Pjvhbp2Icidc+ZG2i4T6nNoTs1CLnT0+vOCLo5gjJK9nbyeP9w wrxWkS3QAWSlPlcFHB8sCEgSKuiAYjX3fiAMNGPboIwXItnHeAsfnHRgC6i9PrKs1KDX v/gPElEveFwVc11nE81JT6/yUVVIYMhdt75NXwUEByeR0KK4nsD7gftHkxSsvbXlnnCj mR7w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=OnzxRF1E; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=clgS8n1i; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=hwG+1V6m; dkim=neutral (body hash did not verify) header.i=@mandelbit.com header.s=google header.b=NCnbiEoF; 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=fail header.i=@openvpn.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 8926c6da1cb9f-4fdd7e3c152si15467550173.48.2025.06.04.06.42.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Jun 2025 06:42:34 -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=OnzxRF1E; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=clgS8n1i; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=hwG+1V6m; dkim=neutral (body hash did not verify) header.i=@mandelbit.com header.s=google header.b=NCnbiEoF; 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=fail 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: 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=ciMkxArQrGRAcT1bmPR/DMPomOzOmqTJdWRh5jkiPVM=; b=OnzxRF1E+NCJUc4292d+dKMNM/ pCdXncYCi54FpFQvqmDp1SZxpojrz1xcOuB7mg5bpvjeil7Jdnn62Q9jhYXpsM2BRg9BcFBsPXkT4 67vJBoj4jgu32FEaOoYJax7naRXvWclBmCzuaehazC/YCDJU5aA+n+n1lkI1EJ9fCdUM=; 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 <openvpn-devel-bounces@lists.sourceforge.net>) id 1uMoNw-0001Oe-Aj; Wed, 04 Jun 2025 13:42:28 +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 <ralf@mandelbit.com>) id 1uMoNv-0001OY-IT for openvpn-devel@lists.sourceforge.net; Wed, 04 Jun 2025 13:42:27 +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=ij3GGrTJLnJb/Dj09yj1bnG2hj/elZDk5IKIs9gWWz0=; b=clgS8n1i91Mn26NrGN6wN7C8BE RSsToJ26OEq20NUfHNUeuB6Ll7vmBMqC8rTxJ8nPEtFv6um4LpAe6MHdU2FeekYOKgAPaf3Bq5ld6 rvMJI0b+Mc62Wohgweeo0uxWFjCNKlt4TEO7uN3j6SCT6aF3h9FEPxMmMGLU1GH9A6VY=; 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=ij3GGrTJLnJb/Dj09yj1bnG2hj/elZDk5IKIs9gWWz0=; b=h wG+1V6mtCFLCmTnjwFEll3Haqzn3KfFgTzln82TnSaIESSHuYdrKzQGxF1NbVYiy84SDhZ0IlNPHO f2mgHCOIFVlf3dNaF6+OqI69UEN2aDRfl7zPrgvJEAIJ9lLhgFIT5qG2m7sdpdf8lu/K7w3XgZe+B YcTQzpCqnwOuMYH0=; Received: from mail-ed1-f52.google.com ([209.85.208.52]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1uMoNu-0006SV-UE for openvpn-devel@lists.sourceforge.net; Wed, 04 Jun 2025 13:42:27 +0000 Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-606ddbda275so2729777a12.1 for <openvpn-devel@lists.sourceforge.net>; Wed, 04 Jun 2025 06:42:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mandelbit.com; s=google; t=1749044535; x=1749649335; 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=ij3GGrTJLnJb/Dj09yj1bnG2hj/elZDk5IKIs9gWWz0=; b=NCnbiEoFoYkHB7IqVuF2XJoMYtqXSh5R44PPwY5bTnekAj6YQCFeKiB/tGGLjPU0mW PrSy9Bjo1Od8VK20D1baHVryDKnuUt0tHICN4w05kWryHQgsNt5AILqj7rBm+U3H8pO9 gUhhfX/U6y02UkoMsGIgW7Ae4zzMJwGSCd4TOWpB4uuEwvNU+vkL8AhRStUR6FQ4+1Lj Bava4gjd+eFC5sPPDpq8ICZavLMH+ra6r7Hx5vBs79UxlmaTV+1t4+vP7h7swo0qAYxo SF3Zu3IF/18moXaY+WySGxv67/H2X+ImlC4z+xbA0xCvUFgMPttdCmA5HEe3kIuLrZ3q NOfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749044535; x=1749649335; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ij3GGrTJLnJb/Dj09yj1bnG2hj/elZDk5IKIs9gWWz0=; b=OmqJZosLRZzqVsAWSqiwlmq1p9tpeNo3UUjyJhJxKjnkDbkOLh/NThNz719+bn81Cm Vg0Icr1Jpksrjq2mzkTPumYqvECc3qHv9rjYEpqU4ZfeebtUfoM1bEYNT0WHwR8lHJBs aJ6AiEwNljNEkr7Oa3yjStDqg6qlEodObFLyqD4h3oNdwqD6dcSKCc3IWGyFzkrAZ5kU LNj+BLUBqCWqTrpAgqJlrV0ovUvBtKD10NfDo0HYDwrZmVLBO2T5+aCBPj9jZ8AUs21g yTJRgh6Z7EiQWOPBQ7LAWWjN03yKQ9j/wETIFON9UGHNamXNoafs902zmHaQTiHsJoi9 IY0g== X-Gm-Message-State: AOJu0YwQ9uo/d3PWqvG/OWxaVHUo29ALDUtFA4ax+7u7FDQeqIueFhsZ 4clIuyp9KkoA5PH+GuBkqTmd6odkX/KyMaxsjQHAyGzcUq1UyOdcgQvlHv633TaIRreCVWVJwkN 8EXCM X-Gm-Gg: ASbGncv195EMIQVSmR2OBzWCLJre0L2ewFAttkluduEqvFnhS4tLJJqqhVQzcVX6/uL f8UfJX/vWps74AF6zaeryWU0Vbb/VbVXKRGQO5ZjK17HHN69lxExtwukg7UPf4O/m40GR02H66S y3nvmY/CqmcJoUk2bs/O9zWfKzm1+hozpZuT/x1OeBvjs8eqlCHo4n8G6SUODSXE0Jk2V1eqHsl VQDMRebXxzbcyEZLItN4zcVDgynxigohEdr+zJApZ8iIc+2RlfyTeQ+sUch33jLAdQD1yg+BpUJ oBzFXj79Z7qPrCRDEyDkxNt+aHNy8gGQho9ZXrWoYUP59jVD X-Received: by 2002:a05:600c:820b:b0:43d:abd:ad1c with SMTP id 5b1f17b1804b1-451f0a5ff09mr24845575e9.6.1749042753415; Wed, 04 Jun 2025 06:12:33 -0700 (PDT) Received: from fedora.. ([2a01:e11:600c:d1a0:3dc8:57d2:efb7:51a8]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a4efe5b79asm21320934f8f.2.2025.06.04.06.12.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jun 2025 06:12:33 -0700 (PDT) From: Ralf Lici <ralf@mandelbit.com> To: openvpn-devel@lists.sourceforge.net Date: Wed, 4 Jun 2025 15:11:58 +0200 Message-ID: <20250604131158.1417342-1-ralf@mandelbit.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-Headers-End: 1uMoNu-0006SV-UE Subject: [Openvpn-devel] [PATCH ovpn-net-next] ovpn: propagate socket mark to skb in UDP X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: <openvpn-devel.lists.sourceforge.net> List-Unsubscribe: <https://lists.sourceforge.net/lists/options/openvpn-devel>, <mailto:openvpn-devel-request@lists.sourceforge.net?subject=unsubscribe> List-Archive: <http://sourceforge.net/mailarchive/forum.php?forum_name=openvpn-devel> List-Post: <mailto:openvpn-devel@lists.sourceforge.net> List-Help: <mailto:openvpn-devel-request@lists.sourceforge.net?subject=help> List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/openvpn-devel>, <mailto:openvpn-devel-request@lists.sourceforge.net?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1834006142658792078?= X-GMAIL-MSGID: =?utf-8?q?1834006142658792078?= |
Series |
[Openvpn-devel,ovpn-net-next] ovpn: propagate socket mark to skb in UDP
|
expand
|
diff --git a/drivers/net/ovpn/udp.c b/drivers/net/ovpn/udp.c index b4fbebad8f45..4f9c9a9a889a 100644 --- a/drivers/net/ovpn/udp.c +++ b/drivers/net/ovpn/udp.c @@ -344,6 +344,7 @@ void ovpn_udp_send_skb(struct ovpn_peer *peer, struct sock *sk, int ret; skb->dev = peer->ovpn->dev; + skb->mark = READ_ONCE(sk->sk_mark); /* no checksum performed at this layer */ skb->ip_summed = CHECKSUM_NONE;
openvpn implements the `--mark` option, which utilizes the `SO_MARK` Linux socket option. However, in the UDP code path, the socket's `sk_mark` value is not currently propagated to `skb` objects that pass through our socket. This commit ensures proper inheritance of the field by assigning `sk_mark` to `skb->mark` before handing the `skb` to the network stack for transmission. Signed-off-by: Ralf Lici <ralf@mandelbit.com> --- drivers/net/ovpn/udp.c | 1 + 1 file changed, 1 insertion(+)