From 5e88e8959926c2e16e09ad1e8bb428207a59d03c Mon Sep 17 00:00:00 2001
From: Hannes Frederic Sowa <hannes@stressinduktion.org>
Date: Sun, 10 Feb 2013 05:35:22 +0000
Subject: [PATCH] --- yaml --- r: 352401 b: refs/heads/master c:
 20314092c1b41894d8c181bf9aa6f022be2416aa h: refs/heads/master i:   352399:
 f70378820503745ee16997248210782dd129e3a7 v: v3

---
 [refs]                     | 2 +-
 trunk/net/ipv6/ip6_input.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5d837fc92780..87bfeabccb1d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd40851521361e07c1f61e79cca941a63ad311bc
+refs/heads/master: 20314092c1b41894d8c181bf9aa6f022be2416aa
diff --git a/trunk/net/ipv6/ip6_input.c b/trunk/net/ipv6/ip6_input.c
index 4ac5bf30e16a..5b10414e619e 100644
--- a/trunk/net/ipv6/ip6_input.c
+++ b/trunk/net/ipv6/ip6_input.c
@@ -118,6 +118,15 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt
 	    ipv6_addr_loopback(&hdr->daddr))
 		goto err;
 
+	/* RFC4291 2.7
+	 * Nodes must not originate a packet to a multicast address whose scope
+	 * field contains the reserved value 0; if such a packet is received, it
+	 * must be silently dropped.
+	 */
+	if (ipv6_addr_is_multicast(&hdr->daddr) &&
+	    IPV6_ADDR_MC_SCOPE(&hdr->daddr) == 0)
+		goto err;
+
 	/*
 	 * RFC4291 2.7
 	 * Multicast addresses must not be used as source addresses in IPv6