From 050f9fd9bcd520f7d162d05dacd05d76c4722501 Mon Sep 17 00:00:00 2001
From: Brian Haley <brian.haley@hp.com>
Date: Tue, 8 Nov 2011 04:41:42 +0000
Subject: [PATCH] --- yaml --- r: 275655 b: refs/heads/master c:
 c457338d7acd3823e765b684a62294cfda9d2f55 h: refs/heads/master i:   275653:
 ea783e6e8e8ab63fd360748e4e42f8f3ec2f8440   275651:
 77dcb5b3163bc6fb6efaad514dcac88b48505981   275647:
 0983e03f0e6a4f6947aeb7fdf47c322a12af9346 v: v3

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

diff --git a/[refs] b/[refs]
index a4f8efe67059..a0c4b219bcc5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10953db8e1a278742ef7e64a3d1491802bcfa98b
+refs/heads/master: c457338d7acd3823e765b684a62294cfda9d2f55
diff --git a/trunk/net/ipv6/ip6_input.c b/trunk/net/ipv6/ip6_input.c
index 027c7ff6f1e5..a46c64eb0a66 100644
--- a/trunk/net/ipv6/ip6_input.c
+++ b/trunk/net/ipv6/ip6_input.c
@@ -111,6 +111,14 @@ 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
+	 * Multicast addresses must not be used as source addresses in IPv6
+	 * packets or appear in any Routing header.
+	 */
+	if (ipv6_addr_is_multicast(&hdr->saddr))
+		goto err;
+
 	skb->transport_header = skb->network_header + sizeof(*hdr);
 	IP6CB(skb)->nhoff = offsetof(struct ipv6hdr, nexthdr);