diff options
Diffstat (limited to 'net/bluetooth/hci_sock.c')
| -rw-r--r-- | net/bluetooth/hci_sock.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 747fabd735d2..d62579b67959 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c | |||
| @@ -193,19 +193,11 @@ static inline int hci_sock_bound_ioctl(struct sock *sk, unsigned int cmd, unsign | |||
| 193 | 193 | ||
| 194 | return 0; | 194 | return 0; |
| 195 | 195 | ||
| 196 | case HCISETSECMGR: | ||
| 197 | if (!capable(CAP_NET_ADMIN)) | ||
| 198 | return -EACCES; | ||
| 199 | |||
| 200 | if (arg) | ||
| 201 | set_bit(HCI_SECMGR, &hdev->flags); | ||
| 202 | else | ||
| 203 | clear_bit(HCI_SECMGR, &hdev->flags); | ||
| 204 | |||
| 205 | return 0; | ||
| 206 | |||
| 207 | case HCIGETCONNINFO: | 196 | case HCIGETCONNINFO: |
| 208 | return hci_get_conn_info(hdev, (void __user *)arg); | 197 | return hci_get_conn_info(hdev, (void __user *) arg); |
| 198 | |||
| 199 | case HCIGETAUTHINFO: | ||
| 200 | return hci_get_auth_info(hdev, (void __user *) arg); | ||
| 209 | 201 | ||
| 210 | default: | 202 | default: |
| 211 | if (hdev->ioctl) | 203 | if (hdev->ioctl) |
| @@ -217,7 +209,7 @@ static inline int hci_sock_bound_ioctl(struct sock *sk, unsigned int cmd, unsign | |||
| 217 | static int hci_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) | 209 | static int hci_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) |
| 218 | { | 210 | { |
| 219 | struct sock *sk = sock->sk; | 211 | struct sock *sk = sock->sk; |
| 220 | void __user *argp = (void __user *)arg; | 212 | void __user *argp = (void __user *) arg; |
| 221 | int err; | 213 | int err; |
| 222 | 214 | ||
| 223 | BT_DBG("cmd %x arg %lx", cmd, arg); | 215 | BT_DBG("cmd %x arg %lx", cmd, arg); |
