diff options
| author | David S. Miller | 2015-12-18 04:08:28 +0100 |
|---|---|---|
| committer | David S. Miller | 2015-12-18 04:08:28 +0100 |
| commit | b3e0d3d7bab14f2544a3314bec53a23dc7dd2206 (patch) | |
| tree | 2bd3c1c1d128e0c362655fa70a6eea02fc856f62 /net/bluetooth | |
| parent | team: Advertise tunneling offload features (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-qcow2-linux-b3e0d3d7bab14f2544a3314bec53a23dc7dd2206.tar.gz kernel-qcow2-linux-b3e0d3d7bab14f2544a3314bec53a23dc7dd2206.tar.xz kernel-qcow2-linux-b3e0d3d7bab14f2544a3314bec53a23dc7dd2206.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/geneve.c
Here we had an overlapping change, where in 'net' the extraneous stats
bump was being removed whilst in 'net-next' the final argument to
udp_tunnel6_xmit_skb() was being changed.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/sco.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index fe129663bd3f..f52bcbf2e58c 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c @@ -526,6 +526,9 @@ static int sco_sock_bind(struct socket *sock, struct sockaddr *addr, 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) { |