Commit ba87c108 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] fix skb leak

This reverts a broken part of the recent "Consolidate skb delivery" patch. 

It was doing an extra increment of skb->users, causing machine death after
just a few seconds of NFS activity.
parent 225c8c42
...@@ -1576,9 +1576,13 @@ int netif_receive_skb(struct sk_buff *skb) ...@@ -1576,9 +1576,13 @@ int netif_receive_skb(struct sk_buff *skb)
} }
} }
if (pt_prev) if (pt_prev) {
ret = deliver_skb(skb, pt_prev, 1); if (!pt_prev->data) {
else { ret = deliver_to_old_ones(pt_prev, skb, 1);
} else {
ret = pt_prev->func(skb, skb->dev, pt_prev);
}
} else {
kfree_skb(skb); kfree_skb(skb);
/* Jamal, now you will not able to escape explaining /* Jamal, now you will not able to escape explaining
* me how you were going to use this. :-) * me how you were going to use this. :-)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment