From d29272a9c4e5a5e793771be97c1df37661b10e53 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 1 Jun 2011 21:05:22 -0700 Subject: [PATCH] --- yaml --- r: 253051 b: refs/heads/master c: d0733d2e29b652b2e7b1438ececa732e4eed98eb h: refs/heads/master i: 253049: e1d1f57738ff5a2469c77862ac889db6bad13439 253047: 2ceb762861d3b77dcd1724bcc40b43f61481913d v: v3 --- [refs] | 2 +- trunk/net/ipv4/af_inet.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ad671e8cdf29..9714497dabd2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 948252cb9e01d65a89ecadf67be5018351eee15e +refs/heads/master: d0733d2e29b652b2e7b1438ececa732e4eed98eb diff --git a/trunk/net/ipv4/af_inet.c b/trunk/net/ipv4/af_inet.c index cc1463156cd0..9c1926027a26 100644 --- a/trunk/net/ipv4/af_inet.c +++ b/trunk/net/ipv4/af_inet.c @@ -465,6 +465,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