From: David S. Miller <davem@davemloft.net>
Date: Tue, 15 Dec 2015 20:39:08 +0000 (-0500)
Subject: bluetooth: Validate socket address length in sco_sock_bind().
X-Git-Tag: v4.1.12-92~201^2~6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2af25068aa375d4a41365d1524261c21c1d929d4;p=users%2Fjedix%2Flinux-maple.git

bluetooth: Validate socket address length in sco_sock_bind().

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>
---

diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 4322c833e748..8611bc7bdd32 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -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) {