Skip to contentSkip to conversation

ipv6: stop multicast forwarding to process interface scoped addresses

PATCH Applied Hannes Frederic Sowa 3 participants 3 messages Mar 8, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v4 3/4 ipv6: stop multicast forwarding to process interface scoped addresses

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

---
 net/ipv6/ip6_input.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
net/ipv6/ip6_input.c +2 -1
index b1876e5..e33fe0a 100644
@@ -281,7 +281,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
Signature · 1 line
1.8.1.4
Acked-by on v4 3/4
#1 lore raw
Quoted 21 lines · Hannes Frederic Sowa

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

---
 net/ipv6/ip6_input.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
net/ipv6/ip6_input.c +0 -0
index b1876e5..e33fe0a 100644

net/ipv6/ip6_input.c int ip6_mc_input(struct sk_buff *skb) · line 288

Quoted 9 lines
net/ipv6/ip6_input.c +2 -1
@@ -281,7 +281,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

And I think this should go to -stable as well,.

--yoshfuji

maintainer Applied
#2 lore raw

From: YOSHIFUJI Hideaki <[email protected]>
Date: Sat, 09 Mar 2013 01:30:20 +0900

Quoted 12 lines
Quoted 11 lines · Hannes Frederic Sowa

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

...

Quoted 3 lines

And I think this should go to -stable as well,.

Applied to 'net' and queued up for -stable, thanks.