Commit 0e698bf6 authored Sep 15, 2012 by Michael S. Tsirkin Committed by David S. Miller Sep 18, 2012

net: fix memory leak on oom with zerocopy



If orphan flags fails, we don't free the skb
on receive, which leaks the skb memory.

Return value was also wrong: netif_receive_skb
is supposed to return NET_RX_DROP, not ENOMEM.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent e4d1aa40

net/core/dev.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3322,7 +3322,7 @@ ncls:

		if (pt_prev) {
		if (unlikely(skb_orphan_frags(skb, GFP_ATOMIC)))
		ret = -ENOMEM;
		goto drop;
		else
		ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
		} else {

Admin message