From 64b2d9adb234d6e56549bed8935cb14ed445cc8e Mon Sep 17 00:00:00 2001 From: "Gustavo F. Padovan" Date: Wed, 22 Dec 2010 23:00:34 -0200 Subject: [PATCH] --- yaml --- r: 225518 b: refs/heads/master c: 17f9cc3124c97f50a19a7597e5f29f915b5b835c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/bluetooth/hci_sock.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c3c4091e5422..ea92d86fb11f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 23bb57633df97ede067ea26f3cdc8a7ba2cd8109 +refs/heads/master: 17f9cc3124c97f50a19a7597e5f29f915b5b835c diff --git a/trunk/net/bluetooth/hci_sock.c b/trunk/net/bluetooth/hci_sock.c index f6c18abab797..29827c77f6ce 100644 --- a/trunk/net/bluetooth/hci_sock.c +++ b/trunk/net/bluetooth/hci_sock.c @@ -380,7 +380,10 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_le if (haddr.hci_family != AF_BLUETOOTH) return -EINVAL; - if (haddr.hci_channel != HCI_CHANNEL_RAW && !enable_mgmt) + if (haddr.hci_channel > HCI_CHANNEL_CONTROL) + return -EINVAL; + + if (haddr.hci_channel == HCI_CHANNEL_CONTROL && !enable_mgmt) return -EINVAL; lock_sock(sk);