Messages in this thread Patch in this message | | | Date | Wed, 16 Apr 2008 18:01:55 -0700 | From | Chris Wright <> | Subject | netpoll: zap_completion_queue: adjust skb->users counter |
| |
-stable review patch. If anyone has any objections, please let us know. ---------------------
From: Jarek Poplawski <jarkao2@gmail.com>
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> --- net/core/netpoll.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
--- 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); + } } } --
| |