diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2020-06-29 19:06:23 -0600 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-06-30 12:29:39 -0700 |
| commit | ab59d2b6982b69a9728296ee3a1f330a72c0383e (patch) | |
| tree | f98a5626d6cfe16c568dc1ffa28c07e5dbd7d954 /net | |
| parent | tun: implement header_ops->parse_protocol for AF_PACKET (diff) | |
| download | wireguard-linux-ab59d2b6982b69a9728296ee3a1f330a72c0383e.tar.xz wireguard-linux-ab59d2b6982b69a9728296ee3a1f330a72c0383e.zip | |
net: vti: implement header_ops->parse_protocol for AF_PACKET
Vti uses skb->protocol to determine packet type, and bails out if it's
not set. For AF_PACKET injection, we need to support its call chain of:
packet_sendmsg -> packet_snd -> packet_parse_headers ->
dev_parse_header_protocol -> parse_protocol
Without a valid parse_protocol, this returns zero, and vti rejects the
skb. So, this wires up the ip_tunnel handler for layer 3 packets for
that case.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/ip_vti.c | 1 | ||||
| -rw-r--r-- | net/ipv6/ip6_vti.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c index 1d9c8cff5ac3..460ca1099e8a 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c @@ -441,6 +441,7 @@ static const struct net_device_ops vti_netdev_ops = { static void vti_tunnel_setup(struct net_device *dev) { dev->netdev_ops = &vti_netdev_ops; + dev->header_ops = &ip_tunnel_header_ops; dev->type = ARPHRD_TUNNEL; ip_tunnel_setup(dev, vti_net_id); } diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c index 1147f647b9a0..0d964160a9dd 100644 --- a/net/ipv6/ip6_vti.c +++ b/net/ipv6/ip6_vti.c @@ -905,6 +905,7 @@ static const struct net_device_ops vti6_netdev_ops = { static void vti6_dev_setup(struct net_device *dev) { dev->netdev_ops = &vti6_netdev_ops; + dev->header_ops = &ip_tunnel_header_ops; dev->needs_free_netdev = true; dev->priv_destructor = vti6_dev_free; |