Patchwork [net-next,v2,4/4] ipv6: stop multicast forwarding to process reserved/interface/link scoped addresses

login
register
mail settings
Submitter Hannes Frederic Sowa
Date Feb. 16, 2013, 7:10 p.m.
Message ID <20130216191021.GA23403@order.stressinduktion.org>
Download mbox | patch
Permalink /patch/221030/
State Changes Requested
Delegated to: David Miller
Headers show

Comments

Hannes Frederic Sowa - Feb. 16, 2013, 7:10 p.m.
v2:
a) unchanged

Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Cc: Brian Haley <brian.haley@hp.com>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
---
 net/ipv6/ip6_input.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c
index 5b10414..974ba8b 100644
--- a/net/ipv6/ip6_input.c
+++ b/net/ipv6/ip6_input.c
@@ -279,7 +279,7 @@  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_needs_scope_id(__ipv6_addr_props(&hdr->daddr)) &&
 	    likely(!(IP6CB(skb)->flags & IP6SKB_FORWARDED))) {
 		/*
 		 * Okay, we try to forward - split and duplicate