1 files changed, 8 insertions, 2 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 3774afc3bebf..2f3dbd657570 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2739,7 +2739,8 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
 
                 qdisc_bstats_update(q, skb);
 
-                if (sch_direct_xmit(skb, q, dev, txq, root_lock)) {
+                skb = validate_xmit_skb(skb, dev);
+                if (skb && sch_direct_xmit(skb, q, dev, txq, root_lock)) {
                         if (unlikely(contended)) {
                                 spin_unlock(&q->busylock);
                                 contended = false;
@@ -2879,6 +2880,10 @@ static int __dev_queue_xmit(struct sk_buff *skb, void *accel_priv)
                         if (__this_cpu_read(xmit_recursion) > RECURSION_LIMIT)
                                 goto recursion_alert;
 
+                        skb = validate_xmit_skb(skb, dev);
+                        if (!skb)
+                                goto drop;
+
                         HARD_TX_LOCK(dev, txq, cpu);
 
                         if (!netif_xmit_stopped(txq)) {
@@ -2904,10 +2909,11 @@ recursion_alert:
         }
 
         rc = -ENETDOWN;
+drop:
         rcu_read_unlock_bh();
 
         atomic_long_inc(&dev->tx_dropped);
-        kfree_skb(skb);
+        kfree_skb_list(skb);
         return rc;
 out:
         rcu_read_unlock_bh();