From 51bfb23084f96ba93bf9b957497bbb74627c5f59 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Mon, 20 Feb 2012 20:54:10 +0100
Subject: [PATCH] --- yaml --- r: 290991 b: refs/heads/master c:
 801f13bd8ecc58f2cf42ec602a2b5db10fc5a132 h: refs/heads/master i:   290989:
 33ddbcab2dbcaec42d8a830c51420aba4a662126   290987:
 c3ec719eb67ffcf220debac8cd1e4f618005b874   290983:
 4c9a9bf07ad326f4a1e45709b525a35d6457a690   290975:
 a79dd990cb851ac52d69f1fa10e964f1748ba0a1 v: v3

---
 [refs]                         | 2 +-
 trunk/net/bluetooth/hci_sock.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cdea0acf8099..a36a24956ec2 100644
--- 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
index 213697d23771..8c429a179aa4 100644
--- 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;