ovpn: reset MAC header before passing skb up
Subsystems (2)
PATCH 1/1 ovpn: reset MAC header before passing skb up
After decapsulating a packet, the skb->mac_header still points to the outer transport header. Call skb_reset_mac_header() in ovpn_netdev_write() to ensure the MAC header points to the beginning of the inner IP packet.
--- drivers/net/ovpn/io.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ovpn/io.c +1 -0
@@ -85,6 +85,7 @@ static void ovpn_netdev_write(struct ovpn_peer *peer, struct sk_buff *skb)skb_scrub_packet (skb, true);/* network header reset in ovpn_decrypt_post() */ +skb_reset_mac_header (skb);skb_reset_transport_header (skb);skb_reset_inner_headers (skb);
Signature · 1 line
2.43.0
Hi Qingfang,
thanks for the patch!
Quoted 4 lines · Qingfang Deng
After decapsulating a packet, the
skb->mac_headerstill points to the outer transport header. Callskb_reset_mac_header()inovpn_netdev_write()to ensure the MAC header points to the beginning of the inner IP packet.
May you elaborate on what this is exactly fixing? Did you encounter a bug triggered by this missing line?
I am asking because I wonder what is "expected" as MAC header for a packet not having one at all (packets delivered to the ovpn interface are L3 only, as per the interface type itself).
Thanks!
Regards,
Quoted 20 lines
Reported-by Minqiang Chen <[email protected]...>Fixes 8534731dbf2d ("ovpn: implement packet processing")Signed-off-by Qingfang Deng <[email protected]...>--- drivers/net/ovpn/io.c | 1 + 1 file changed, 1 insertion(+)drivers/net/ovpn/io.c +1
-0@@ -85,6 +85,7 @@ static void ovpn_netdev_write(struct ovpn_peer *peer, struct sk_buff *skb)skb_scrub_packet (skb, true);/* network header reset in ovpn_decrypt_post() */ +skb_reset_mac_header (skb);skb_reset_transport_header (skb);skb_reset_inner_headers (skb);
Signature · 1 line
Antonio Quartulli
Hi,
Quoted 10 lines · Antonio Quartulli
Hi Qingfang,
thanks for the patch!
Quoted 4 lines · Qingfang Deng
After decapsulating a packet, the
skb->mac_headerstill points to the outer transport header. Callskb_reset_mac_header()inovpn_netdev_write()to ensure the MAC header points to the beginning of the inner IP packet.
Quoted 4 lines
May you elaborate on what this is exactly fixing? Did you encounter a bug triggered by this missing line?
I am asking because I wonder what is "expected" as MAC header for a packet not having one at all (packets delivered to the ovpn interface are L3 only, as per the interface type itself).
For L3-only devices, the net core expects skb->mac_header == skb->network_header.
For example, in __netif_receive_skb_core(), skb_reset_mac_len() sets skb->mac_len to (skb->network_header - skb->mac_header). If skb->mac_header still has a stale value, this will incorrectly assign a non-zero value to skb->mac_len.
Also, if generic XDP or SOCK_PACKET is used, either will do skb_push(skb, skb->data - skb_mac_header(skb));
Quoted 13 lines
Thanks!
Regards,
Quoted 8 lines
Reported-by Minqiang Chen <[email protected]...>Fixes 8534731dbf2d ("ovpn: implement packet processing")Signed-off-by Qingfang Deng <[email protected]...>---
drivers/net/ovpn/io.c| 1 +1 file changed, 1 insertion(+)
Quoted 12 lines
drivers/net/ovpn/io.c static void ovpn_netdev_write(struct ovpn_peer · line 90
Quoted 11 lines
drivers/net/ovpn/io.c +1
-0@@ -85,6 +85,7 @@ static void ovpn_netdev_write(struct ovpn_peer *peer, struct sk_buff *skb) skb_scrub_packet(skb, true); /* network header reset in ovpn_decrypt_post() */ + skb_reset_mac_header(skb); skb_reset_transport_header(skb); skb_reset_inner_headers(skb);
+Cc: netdev
Regards,
Qingfang
Hi,
Quoted 18 lines · Qingfang Deng
Hi,
Quoted 10 lines · Antonio Quartulli
Hi Qingfang,
thanks for the patch!
Quoted 4 lines · Qingfang Deng
After decapsulating a packet, the
skb->mac_headerstill points to the outer transport header. Callskb_reset_mac_header()inovpn_netdev_write()to ensure the MAC header points to the beginning of the inner IP packet.Quoted 4 lines
May you elaborate on what this is exactly fixing? Did you encounter a bug triggered by this missing line?
I am asking because I wonder what is "expected" as MAC header for a packet not having one at all (packets delivered to the ovpn interface are L3 only, as per the interface type itself).
Quoted 8 lines
For L3-only devices, the net core expects
skb->mac_header== skb-Quoted 1 line
network_header.For example, in
__netif_receive_skb_core(),skb_reset_mac_len()setsskb->mac_lento (skb->network_header-skb->mac_header). Ifskb->mac_headerstill has a stale value, this will incorrectly assign a non-zero value toskb->mac_len.Also, if generic XDP or
SOCK_PACKETis used, either will do
skb_push(skb, skb->data - skb_mac_header(skb));
Thanks a lot! This makes sense!
I'm applying the patch to my tree.
Regards,
Signature · 1 line
Antonio Quartulli