---

yaml --- r: 290991 b: refs/heads/master c: 801f13b h: refs/heads/master i: 290989: 33ddbca 290987: c3ec719 290983: 4c9a9bf 290975: a79dd99 v: v3
git-mirror · Feb 20, 2012 · 51bfb23 · 51bfb23
1 parent b06c8e6
commit 51bfb23
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd82e61c110a36e398323e422896fcfe05879fed
+refs/heads/master: 801f13bd8ecc58f2cf42ec602a2b5db10fc5a132
diff --git a/trunk/net/bluetooth/hci_sock.c b/trunk/net/bluetooth/hci_sock.c
@@ -656,6 +656,11 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_le
 			goto done;
 		}
 
+		if (!capable(CAP_NET_ADMIN)) {
+			err = -EPERM;
+			goto done;
+		}
+
 		set_bit(HCI_PI_MGMT_INIT, &hci_pi(sk)->flags);
 		break;