Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50cbe9ab authored by David S. Miller's avatar David S. Miller
Browse files

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



Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eae3f88e

include/linux/netdevice.h

+1 −0
Original line number Diff line number Diff line
@@ -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);

net/core/dev.c

+1 −5
Original line number Diff line number Diff line
@@ -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);

net/sched/sch_generic.c

+4 −1
Original line number Diff line number Diff line
@@ -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;