diff options
| author | Marcus Meissner <meissner@suse.de> | 2011-06-06 08:00:07 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-06 23:48:16 +0200 |
| commit | 5a079c305ad4dda9708b7a29db4a8bd38e21c3a6 (patch) | |
| tree | 04d25cdf27ab7d5b8150200ec3a483a6f0a08581 /net/ipv6 | |
| parent | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin... (diff) | |
| download | linux-5a079c305ad4dda9708b7a29db4a8bd38e21c3a6.tar.xz linux-5a079c305ad4dda9708b7a29db4a8bd38e21c3a6.zip | |
net/ipv6: check for mistakenly passed in non-AF_INET6 sockaddrs
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>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/af_inet6.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index b7919f901fbf..d450a2f9fc06 100644 --- a/net/ipv6/af_inet6.c +++ b/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; |