1 files changed, 11 insertions, 3 deletions

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 5209ee9aac47..2aae11feff0c 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -2219,7 +2219,7 @@ static void vxlan_encap_bypass(struct sk_buff *skb, struct vxlan_dev *src_vxlan,
         struct pcpu_sw_netstats *tx_stats, *rx_stats;
         union vxlan_addr loopback;
         union vxlan_addr *remote_ip = &dst_vxlan->default_dst.remote_ip;
-        struct net_device *dev = skb->dev;
+        struct net_device *dev;
         int len = skb->len;
 
         tx_stats = this_cpu_ptr(src_vxlan->dev->tstats);
@@ -2239,9 +2239,15 @@ static void vxlan_encap_bypass(struct sk_buff *skb, struct vxlan_dev *src_vxlan,
 #endif
         }
 
+        rcu_read_lock();
+        dev = skb->dev;
+        if (unlikely(!(dev->flags & IFF_UP))) {
+                kfree_skb(skb);
+                goto drop;
+        }
+
         if (dst_vxlan->cfg.flags & VXLAN_F_LEARN)
-                vxlan_snoop(skb->dev, &loopback, eth_hdr(skb)->h_source, 0,
-                            vni);
+                vxlan_snoop(dev, &loopback, eth_hdr(skb)->h_source, 0, vni);
 
         u64_stats_update_begin(&tx_stats->syncp);
         tx_stats->tx_packets++;
@@ -2254,8 +2260,10 @@ static void vxlan_encap_bypass(struct sk_buff *skb, struct vxlan_dev *src_vxlan,
                 rx_stats->rx_bytes += len;
                 u64_stats_update_end(&rx_stats->syncp);
         } else {
+drop:
                 dev->stats.rx_dropped++;
         }
+        rcu_read_unlock();
 }
 
 static int encap_bypass_if_local(struct sk_buff *skb, struct net_device *dev,