---

yaml --- r: 135525 b: refs/heads/master c: 783ed5a h: refs/heads/master i: 135523: f2e5e55 v: v3
git-mirror · Mar 25, 2009 · 077f20a · 077f20a
1 parent 0d8885d
commit 077f20a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4097f663cbe9e58de7ebed222f8af33267f297a8
+refs/heads/master: 783ed5a78373253052bc61a3c5c8b9f17af4e3c6
diff --git a/trunk/net/ipv6/af_inet6.c b/trunk/net/ipv6/af_inet6.c
@@ -276,6 +276,13 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
 
 	/* Check if the address belongs to the host. */
 	if (addr_type == IPV6_ADDR_MAPPED) {
+		/* Binding to v4-mapped address on a v6-only socket
+		 * makes no sense
+		 */
+		if (np->ipv6only) {
+			err = -EINVAL;
+			goto out;
+		}
 		v4addr = addr->sin6_addr.s6_addr32[3];
 		if (inet_addr_type(net, v4addr) != RTN_LOCAL) {
 			err = -EADDRNOTAVAIL;