From 8d8301793d316dd4a34f98d18f5cf221e9609c01 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.de>
Date: Mon, 6 Jun 2011 06:00:07 +0000
Subject: [PATCH] --- yaml --- r: 253400 b: refs/heads/master c:
 5a079c305ad4dda9708b7a29db4a8bd38e21c3a6 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv6/af_inet6.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1ab1e5b247ba..7ba4d2f69d72 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b22b1b1e169c6591aa125525223f70e40ed4acf
+refs/heads/master: 5a079c305ad4dda9708b7a29db4a8bd38e21c3a6
diff --git a/trunk/net/ipv6/af_inet6.c b/trunk/net/ipv6/af_inet6.c
index b7919f901fbf..d450a2f9fc06 100644
--- a/trunk/net/ipv6/af_inet6.c
+++ b/trunk/net/ipv6/af_inet6.c
@@ -272,6 +272,10 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
 
 	if (addr_len < SIN6_LEN_RFC2133)
 		return -EINVAL;
+
+	if (addr->sin6_family != AF_INET6)
+		return -EINVAL;
+
 	addr_type = ipv6_addr_type(&addr->sin6_addr);
 	if ((addr_type & IPV6_ADDR_MULTICAST) && sock->type == SOCK_STREAM)
 		return -EINVAL;