]> git.hungrycats.org Git - linux/commitdiff
ipv6: Make MLD packets to only be processed locally
authorAngga <Hermin.Anggawijaya@alliedtelesis.co.nz>
Fri, 3 Jul 2015 02:40:52 +0000 (14:40 +1200)
committerSasha Levin <sasha.levin@oracle.com>
Sun, 27 Sep 2015 16:18:54 +0000 (12:18 -0400)
[ 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: Sasha Levin <sasha.levin@oracle.com>
net/ipv6/ip6_input.c

index a3084ab5df6cd1b343af6d725975082f5c4b6eb6..ac5e973e9eb5cab3b780a1362751a24c06b98562 100644 (file)
@@ -329,10 +329,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 */
                }