summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorMarcus Meissner <meissner@suse.de>2011-06-01 21:05:22 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-07-13 05:29:27 +0200
commit4e754b40ebbd638984e33eb8509acb63b9c7f253 (patch)
tree06271e3e827fdc72c8d0c9953a999ed555b97881 /net
parentcc2c6564492b2a5f570d08d127c1496cc185a5f5 (diff)
net/ipv4: Check for mistakenly passed in non-IPv4 address
[ Upstream commit d0733d2e29b652b2e7b1438ececa732e4eed98eb ] Check against mistakenly passing in IPv6 addresses (which would result in an INADDR_ANY bind) or similar incompatible sockaddrs. Signed-off-by: Marcus Meissner <meissner@suse.de> Cc: Reinhard Max <max@suse.de> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/af_inet.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 57737b8d1711..a2898785c8b3 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -460,6 +460,9 @@ int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
if (addr_len < sizeof(struct sockaddr_in))
goto out;
+ if (addr->sin_family != AF_INET)
+ goto out;
+
chk_addr_ret = inet_addr_type(sock_net(sk), addr->sin_addr.s_addr);
/* Not specified by any standard per-se, however it breaks too