From: Jarek Poplawski <jarkao2@gmail.com>
Date: Mon, 7 Apr 2008 06:40:53 +0000 (-0700)
Subject: netpoll: zap_completion_queue: adjust skb->users counter
X-Git-Tag: v2.6.24.5~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08fb454fcf51b9133bb6d88e009d89127238e24c;p=thirdparty%2Fkernel%2Fstable.git

netpoll: zap_completion_queue: adjust skb->users counter

Upstream commit: 8a455b087c9629b3ae3b521b4f1ed16672f978cc

zap_completion_queue() retrieves skbs from completion_queue where they have
zero skb->users counter.  Before dev_kfree_skb_any() it should be non-zero
yet, so it's increased now.

Reported-and-tested-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
---

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index c499b5c69bedb..2386c5e16784c 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -219,10 +219,12 @@ static void zap_completion_queue(void)
 		while (clist != NULL) {
 			struct sk_buff *skb = clist;
 			clist = clist->next;
-			if (skb->destructor)
+			if (skb->destructor) {
+				atomic_inc(&skb->users);
 				dev_kfree_skb_any(skb); /* put this one back */
-			else
+			} else {
 				__kfree_skb(skb);
+			}
 		}
 	}