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

Commit 1080e512 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by David S. Miller
Browse files

net: orphan frags on receive 



zero copy packets are normally sent to the outside
network, but bridging, tun etc might loop them
back to host networking stack. If this happens
destructors will never be called, so orphan
the frags immediately on receive.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 868eefeb

net/core/dev.c

+6 −1
Original line number Diff line number Diff line
@@ -1632,6 +1632,8 @@ static inline int deliver_skb(struct sk_buff *skb, 
			      struct packet_type *pt_prev,

			      struct net_device *orig_dev)

{

	if (unlikely(skb_orphan_frags(skb, GFP_ATOMIC)))

		return -ENOMEM;

	atomic_inc(&skb->users);

	return pt_prev->func(skb, skb->dev, pt_prev, orig_dev);

}
@@ -3262,6 +3264,9 @@ ncls: 
	}



	if (pt_prev) {

		if (unlikely(skb_orphan_frags(skb, GFP_ATOMIC)))

			ret = -ENOMEM;

		else

			ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);

	} else {

		atomic_long_inc(&skb->dev->rx_dropped);