From patchwork Sun Sep 16 08:44:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: net: fix memory leak on oom with zerocopy Date: Sat, 15 Sep 2012 22:44:16 -0000 From: "Michael S. Tsirkin" X-Patchwork-Id: 184120 Message-Id: <20120916084416.GA22936@redhat.com> To: unlisted-recipients:; (no To-header on input) Cc: "David S. Miller" , Eric Dumazet , Ben Hutchings , =?utf-8?B?TWljaGHFgiBNaXJvc8WCYXc=?= , netdev@vger.kernel.org, linux-kernel@vger.kernel.org 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 --- Fixes a memory leak so 3.6 material? net/core/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/dev.c b/net/core/dev.c index 8398836..899f827 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3321,7 +3321,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 {