diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-03-01 18:16:57 +0100 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-03-01 18:16:57 +0100 |
| commit | 949ad8c06ec4093f51fcefe6fcde1d95f6f6eb73 (patch) | |
| tree | 9a268cbb25992fdd7147e8af72f68d315ef4caeb /net/ipv6 | |
| parent | 74374e40791f1f7b58252df275dd5227ead88b89 (diff) | |
| parent | bf6a68d2a214e07f7c0d6538e00e17b826714160 (diff) | |
| download | kernel_samsung_crespo-949ad8c06ec4093f51fcefe6fcde1d95f6f6eb73.zip kernel_samsung_crespo-949ad8c06ec4093f51fcefe6fcde1d95f6f6eb73.tar.gz kernel_samsung_crespo-949ad8c06ec4093f51fcefe6fcde1d95f6f6eb73.tar.bz2 | |
Merge branch 'linux-3.0.y' into cm.ics
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ip6mr.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 82a8099..86e3cc1 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -696,8 +696,10 @@ static netdev_tx_t reg_vif_xmit(struct sk_buff *skb, int err; err = ip6mr_fib_lookup(net, &fl6, &mrt); - if (err < 0) + if (err < 0) { + kfree_skb(skb); return err; + } read_lock(&mrt_lock); dev->stats.tx_bytes += skb->len; @@ -2051,8 +2053,10 @@ int ip6_mr_input(struct sk_buff *skb) int err; err = ip6mr_fib_lookup(net, &fl6, &mrt); - if (err < 0) + if (err < 0) { + kfree_skb(skb); return err; + } read_lock(&mrt_lock); cache = ip6mr_cache_find(mrt, |