]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
bluetooth: Validate socket address length in sco_sock_bind().
authorDavid S. Miller <davem@davemloft.net>
Tue, 15 Dec 2015 20:39:08 +0000 (15:39 -0500)
committerChuck Anderson <chuck.anderson@oracle.com>
Fri, 5 Feb 2016 03:33:29 +0000 (19:33 -0800)
Orabug: 22641775

[ Upstream commit 5233252fce714053f0151680933571a2da9cbfb4 ]

Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 1814295365a02ff174948159f1eececa55fe4f97)
Signed-off-by: Dan Duval <dan.duval@oracle.com>
net/bluetooth/sco.c

index 4322c833e74891d20a627f21e64cdedd67cd806f..8611bc7bdd327993219d37a85ba7787afbe3387c 100644 (file)
@@ -520,6 +520,9 @@ static int sco_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_le
        if (!addr || addr->sa_family != AF_BLUETOOTH)
                return -EINVAL;
 
+       if (addr_len < sizeof(struct sockaddr_sco))
+               return -EINVAL;
+
        lock_sock(sk);
 
        if (sk->sk_state != BT_OPEN) {