Perform the address length check first, before calling
the the proto specific bind() function

Signed-off-by: Denis Kirjanov <k...@linux-powerpc.org>
---
 net/ipv4/af_inet.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 6ad0f7a..333e2fa 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -426,14 +426,15 @@ int inet_bind(struct socket *sock, struct sockaddr 
*uaddr, int addr_len)
        int chk_addr_ret;
        int err;
 
+       err = -EINVAL;
+       if (addr_len < sizeof(struct sockaddr_in))
+               goto out;
+
        /* If the socket has its own bind function then use it. (RAW) */
        if (sk->sk_prot->bind) {
                err = sk->sk_prot->bind(sk, uaddr, addr_len);
                goto out;
        }
-       err = -EINVAL;
-       if (addr_len < sizeof(struct sockaddr_in))
-               goto out;
 
        if (addr->sin_family != AF_INET) {
                /* Compatibility games : accept AF_UNSPEC (mapped to AF_INET)
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to