diff options
| author | Hannes Frederic Sowa <hannes@stressinduktion.org> | 2013-03-08 02:07:23 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-20 13:05:02 -0700 |
| commit | 47d7ed18c33cc4e9cba603c7ca776c40037ae842 (patch) | |
| tree | 9e4ffec7197c072c6d371e28f9b5138de627fd01 /net | |
| parent | c7a226b6464bfdc67433adcfe9e17b816157af98 (diff) | |
| download | linux-3.10-47d7ed18c33cc4e9cba603c7ca776c40037ae842.tar.gz linux-3.10-47d7ed18c33cc4e9cba603c7ca776c40037ae842.tar.bz2 linux-3.10-47d7ed18c33cc4e9cba603c7ca776c40037ae842.zip | |
ipv6: stop multicast forwarding to process interface scoped addresses
[ Upstream commit ddf64354af4a702ee0b85d0a285ba74c7278a460 ]
v2:
a) used struct ipv6_addr_props
v3:
a) reverted changes for ipv6_addr_props
v4:
a) do not use __ipv6_addr_needs_scope_id
Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/ip6_input.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c index 1ca5d45a12e..d813575410d 100644 --- a/net/ipv6/ip6_input.c +++ b/net/ipv6/ip6_input.c @@ -265,7 +265,8 @@ int ip6_mc_input(struct sk_buff *skb) * IPv6 multicast router mode is now supported ;) */ if (dev_net(skb->dev)->ipv6.devconf_all->mc_forwarding && - !(ipv6_addr_type(&hdr->daddr) & IPV6_ADDR_LINKLOCAL) && + !(ipv6_addr_type(&hdr->daddr) & + (IPV6_ADDR_LOOPBACK|IPV6_ADDR_LINKLOCAL)) && likely(!(IP6CB(skb)->flags & IP6SKB_FORWARDED))) { /* * Okay, we try to forward - split and duplicate |