net: Validate xmit SKBs right when we pull them out of the qdisc.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 5050218c5b7f402d1a4904390bb1a8c30e937ef6..47c49ba2dcf4d91fd69f4a1cfc7d0a72a8b75891 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2827,6 +2827,7 @@ int dev_set_mac_address(struct net_device *, struct sockaddr *);
 int dev_change_carrier(struct net_device *, bool new_carrier);
 int dev_get_phys_port_id(struct net_device *dev,
                         struct netdev_phys_port_id *ppid);
+struct sk_buff *validate_xmit_skb(struct sk_buff *skb, struct net_device *dev);
 int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
                        struct netdev_queue *txq);
 int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb);

diff --git a/net/core/dev.c b/net/core/dev.c
index 704a5434f77d300fe266aa05ae563c861a698f86..75bc5b068a130cb82451044791f6f541a0dceb02 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2656,7 +2656,7 @@ struct sk_buff *validate_xmit_vlan(struct sk_buff *skb, netdev_features_t featur
        return skb;
 }
 
-static struct sk_buff *validate_xmit_skb(struct sk_buff *skb, struct net_device *dev)
+struct sk_buff *validate_xmit_skb(struct sk_buff *skb, struct net_device *dev)
 {
        netdev_features_t features;
 
@@ -2719,10 +2719,6 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
 {
        int rc = NETDEV_TX_OK;
 
-       skb = validate_xmit_skb(skb, dev);
-       if (!skb)
-               return rc;
-
        if (likely(!skb->next))
                return xmit_one(skb, dev, txq, false);
 

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 05b3f5d104af62c9656e36eb28748b06fa380ccf..f178798a5836d6ba002675447da8c2ee009c609e 100644 (file)
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -70,8 +70,11 @@ static inline struct sk_buff *dequeue_skb(struct Qdisc *q)
                } else
                        skb = NULL;
        } else {
-               if (!(q->flags & TCQ_F_ONETXQUEUE) || !netif_xmit_frozen_or_stopped(txq))
+               if (!(q->flags & TCQ_F_ONETXQUEUE) || !netif_xmit_frozen_or_stopped(txq)) {
                        skb = q->dequeue(q);
+                       if (skb)
+                               skb = validate_xmit_skb(skb, qdisc_dev(q));
+               }
        }
 
        return skb;