net/ipv6: check for mistakenly passed in non-AF_INET6 sockaddrs
authorMarcus Meissner <meissner@suse.de>
Mon, 6 Jun 2011 06:00:07 +0000 (06:00 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 6 Jun 2011 21:48:16 +0000 (14:48 -0700)
Same check as for IPv4, also do for IPv6.

(If you passed in a IPv4 sockaddr_in here, the sizeof check
 in the line before would have triggered already though.)

Signed-off-by: Marcus Meissner <meissner@suse.de>
Cc: Reinhard Max <max@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/af_inet6.c

index b7919f901fbf76ce511313d39e638d69a18269ad..d450a2f9fc0645b7addef3fcbf2d586e89d86da7 100644 (file)
@@ -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;