leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: check UDP tunnel RX port offload feature before calling tunnel ndo ndo

Browse Source 
If NETIF_F_RX_UDP_TUNNEL_PORT was disabled on a given netdevice, skip
the tunnel offload ndo call during tunnel port creation and deletion.

Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sabrina Dubroca
2017-07-21 12:49:29 +02:00
committed by David S. Miller
parent d764a122cc
commit 7a27fc6d53
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/ipv4/udp_tunnel.c
View File

@@ -82,7 +82,8 @@ void udp_tunnel_push_rx_port(struct net_device *dev, struct socket *sock,
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
struct udp_tunnel_info ti; struct udp_tunnel_info ti;
if (!dev->netdev_ops->ndo_udp_tunnel_add) if (!dev->netdev_ops->ndo_udp_tunnel_add ||
!(dev->features & NETIF_F_RX_UDP_TUNNEL_PORT))
return; return;
ti.type = type; ti.type = type;
@@ -109,6 +110,8 @@ void udp_tunnel_notify_add_rx_port(struct socket *sock, unsigned short type)
for_each_netdev_rcu(net, dev) { for_each_netdev_rcu(net, dev) {
if (!dev->netdev_ops->ndo_udp_tunnel_add) if (!dev->netdev_ops->ndo_udp_tunnel_add)
continue; continue;
if (!(dev->features & NETIF_F_RX_UDP_TUNNEL_PORT))
continue;
dev->netdev_ops->ndo_udp_tunnel_add(dev, &ti); dev->netdev_ops->ndo_udp_tunnel_add(dev, &ti);
} }
rcu_read_unlock(); rcu_read_unlock();
@@ -131,6 +134,8 @@ void udp_tunnel_notify_del_rx_port(struct socket *sock, unsigned short type)
for_each_netdev_rcu(net, dev) { for_each_netdev_rcu(net, dev) {
if (!dev->netdev_ops->ndo_udp_tunnel_del) if (!dev->netdev_ops->ndo_udp_tunnel_del)
continue; continue;
if (!(dev->features & NETIF_F_RX_UDP_TUNNEL_PORT))
continue;
dev->netdev_ops->ndo_udp_tunnel_del(dev, &ti); dev->netdev_ops->ndo_udp_tunnel_del(dev, &ti);
} }
rcu_read_unlock(); rcu_read_unlock();