diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2025-07-17 07:41:25 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2025-07-17 07:41:25 -0700 |
| commit | afb5bef57f90edaa6e8b10fd27236443218f8b5d (patch) | |
| tree | b9a9a50235c079f6d0e69dfc954a7e2225574c2c /drivers/net/ovpn/udp.c | |
| parent | 4ab26bce3969f8fd925fe6f6f551e4d1a508c68b (diff) | |
| parent | 2022d704014d7a5b19dfe0a1ae5c67be0498e37c (diff) | |
Merge tag 'ovpn-net-20250716' of https://github.com/OpenVPN/ovpn-net-next
Antonio Quartulli says:
====================
This bugfix batch includes the following changes:
* properly propagate sk mark to skb->mark field
* reject unexpected incoming netlink attributes
* reset GSO state when moving skb from transport to tunnel layer
* tag 'ovpn-net-20250716' of https://github.com/OpenVPN/ovpn-net-next:
ovpn: reset GSO metadata after decapsulation
ovpn: reject unexpected netlink attributes
ovpn: propagate socket mark to skb in UDP
====================
Link: https://patch.msgid.link/20250716115443.16763-1-antonio@openvpn.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ovpn/udp.c')
| -rw-r--r-- | drivers/net/ovpn/udp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ovpn/udp.c b/drivers/net/ovpn/udp.c index bff00946eae2..60435a21f29c 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; |