diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2025-07-17 17:41:25 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2025-07-17 17:41:25 +0300 |
| commit | afb5bef57f90edaa6e8b10fd27236443218f8b5d (patch) | |
| tree | b9a9a50235c079f6d0e69dfc954a7e2225574c2c /drivers/net/ovpn/io.c | |
| parent | 4ab26bce3969f8fd925fe6f6f551e4d1a508c68b (diff) | |
| parent | 2022d704014d7a5b19dfe0a1ae5c67be0498e37c (diff) | |
| download | linux-afb5bef57f90edaa6e8b10fd27236443218f8b5d.tar.xz | |
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/io.c')
| -rw-r--r-- | drivers/net/ovpn/io.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/ovpn/io.c b/drivers/net/ovpn/io.c index ebf1e849506b..3e9e7f8444b3 100644 --- a/drivers/net/ovpn/io.c +++ b/drivers/net/ovpn/io.c @@ -62,6 +62,13 @@ static void ovpn_netdev_write(struct ovpn_peer *peer, struct sk_buff *skb) unsigned int pkt_len; int ret; + /* + * GSO state from the transport layer is not valid for the tunnel/data + * path. Reset all GSO fields to prevent any further GSO processing + * from entering an inconsistent state. + */ + skb_gso_reset(skb); + /* we can't guarantee the packet wasn't corrupted before entering the * VPN, therefore we give other layers a chance to check that */ |