aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngga <Hermin.Anggawijaya@alliedtelesis.co.nz>2015-07-03 14:40:52 +1200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-01 12:07:34 +0200
commit3b9393dc1d4cc226bce44708ab899518cc598e57 (patch)
treef339a13f96ca20363ebc0fac4c8cdb09ed811516
parent9f6191daa545384ce5cc90b770f0d2bf64c0ba22 (diff)
downloadlinux-linaro-stable-3b9393dc1d4cc226bce44708ab899518cc598e57.tar.gz
ipv6: Make MLD packets to only be processed locally
[ Upstream commit 4c938d22c88a9ddccc8c55a85e0430e9c62b1ac5 ] Before commit daad151263cf ("ipv6: Make ipv6_is_mld() inline and use it from ip6_mc_input().") MLD packets were only processed locally. After the change, a copy of MLD packet goes through ip6_mr_input, causing MRT6MSG_NOCACHE message to be generated to user space. Make MLD packet only processed locally. Fixes: daad151263cf ("ipv6: Make ipv6_is_mld() inline and use it from ip6_mc_input().") Signed-off-by: Hermin Anggawijaya <hermin.anggawijaya@alliedtelesis.co.nz> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--net/ipv6/ip6_input.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c
index 774b09cb2920..63264c9a15cb 100644
--- a/net/ipv6/ip6_input.c
+++ b/net/ipv6/ip6_input.c
@@ -325,10 +325,10 @@ int ip6_mc_input(struct sk_buff *skb)
if (offset < 0)
goto out;
- if (!ipv6_is_mld(skb, nexthdr, offset))
- goto out;
+ if (ipv6_is_mld(skb, nexthdr, offset))
+ deliver = true;
- deliver = true;
+ goto out;
}
/* unknown RA - process it normally */
}