aboutsummaryrefslogtreecommitdiff
path: root/net/bluetooth
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-02-10 18:24:22 +0000
committerMark Brown <broonie@kernel.org>2016-02-10 18:24:22 +0000
commit6b4fe72f6c1ab93a893a8bc2e1155d34d7689440 (patch)
tree68a7126da5b4fced21d1b803e0d5f391463b1cfd /net/bluetooth
parent8fa6d2e1fe937af9dbacb5aad8c43dbb67466fa0 (diff)
parent130faf3765d29c961be74f7245eb504a414a68e2 (diff)
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/sco.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 7ee9e4ab00f8..b3ef78a644ed 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) {