diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-09 08:01:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-09 08:01:19 -0700 |
| commit | a8f43ee7e108cecf68cac652d0a3aeedb8131220 (patch) | |
| tree | 53ddd1ab32f9146453531e3183654045c57d621f /net/ipv6/sit.c | |
| parent | 91e37a793b5a9436a2d12b2f0a8f52db3a133e1d (diff) | |
| parent | 36ca34cc3b8335eb1fe8bd9a1d0a2592980c3f02 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
sit: Add missing kfree_skb() on pskb_may_pull() failure.
tipc: Increase buffer header to support worst-case device
Diffstat (limited to 'net/ipv6/sit.c')
| -rw-r--r-- | net/ipv6/sit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 4b2f1033994e..5a6fab95569f 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -596,9 +596,9 @@ static int ipip6_rcv(struct sk_buff *skb) } icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); - kfree_skb(skb); read_unlock(&ipip6_lock); out: + kfree_skb(skb); return 0; } |