aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorBen Greear <greearb@candelatech.com>2011-09-27 15:16:08 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-29 16:33:48 -0800
commit23b139ecf944b097a0493262cbc04886363bd8e6 (patch)
tree7fb53fa36a9aed58423ab8df27798d81d1103a3b /net/ipv6
parentd6be19f41ab91acca04abdca61353245d57d9ffc (diff)
downloadkernel_samsung_smdk4412-23b139ecf944b097a0493262cbc04886363bd8e6.zip
kernel_samsung_smdk4412-23b139ecf944b097a0493262cbc04886363bd8e6.tar.gz
kernel_samsung_smdk4412-23b139ecf944b097a0493262cbc04886363bd8e6.tar.bz2
ipv6-multicast: Fix memory leak in input path.
[ Upstream commit 2015de5fe2a47086a3260802275932bfd810884e ] Have to free the skb before returning if we fail the fib lookup. Signed-off-by: Ben Greear <greearb@candelatech.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/ip6mr.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index 82a8099..450a1ff 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -2051,8 +2051,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,