[IPV6] MCAST: Ensure to check multicast listener(s).
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Tue, 1 Apr 2008 02:30:45 +0000 (19:30 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 1 Apr 2008 02:30:45 +0000 (19:30 -0700)
In ip6_mc_input(), we need to check whether we have listener(s) for
the packet.

After commit ae7bf20a6316272acfcaef5d265b18aaa54b41e4, all packets
for multicast destinations are delivered to upper layer if
IFF_PROMISC or IFF_ALLMULTI is set.

In fact, bug was rather ancient; the original (before the commit)
intent of the dev->flags check was to skip the ipv6_chk_mcast_addr()
call, assuming L2 filters packets appropriately, but it was even not
true.

Let's explicitly check our multicast list.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Acked-by: David L Stevens <dlstevens@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/ip6_input.c

index 178aebc0427a1d05051598b9ab2f6b233abfbb66..98ab4f459905dce22f29a46450157a7ba8623f32 100644 (file)
@@ -239,8 +239,7 @@ int ip6_mc_input(struct sk_buff *skb)
        IP6_INC_STATS_BH(ip6_dst_idev(skb->dst), IPSTATS_MIB_INMCASTPKTS);
 
        hdr = ipv6_hdr(skb);
-       deliver = unlikely(skb->dev->flags & (IFF_PROMISC|IFF_ALLMULTI)) ||
-           ipv6_chk_mcast_addr(skb->dev, &hdr->daddr, NULL);
+       deliver = ipv6_chk_mcast_addr(skb->dev, &hdr->daddr, NULL);
 
        /*
         *      IPv6 multicast router mode isnt currently supported.