5 files changed, 92 insertions, 34 deletions

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index ee1ee1bfae9e..5b924423cf20 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -873,6 +873,8 @@ int mgmt_device_found(u16 index, bdaddr_t *bdaddr, u8 *dev_class, s8 rssi,
                                                                 u8 *eir);
 int mgmt_remote_name(u16 index, bdaddr_t *bdaddr, u8 *name);
 int mgmt_discovering(u16 index, u8 discovering);
+int mgmt_device_blocked(u16 index, bdaddr_t *bdaddr);
+int mgmt_device_unblocked(u16 index, bdaddr_t *bdaddr);
 
 /* HCI info for socket */
 #define hci_pi(sk) ((struct hci_pinfo *) sk)
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index 48522e6386bf..d66da0f94f95 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -307,3 +307,13 @@ struct mgmt_ev_remote_name {
 } __packed;
 
 #define MGMT_EV_DISCOVERING             0x0014
+
+#define MGMT_EV_DEVICE_BLOCKED          0x0015
+struct mgmt_ev_device_blocked {
+        bdaddr_t bdaddr;
+} __packed;
+
+#define MGMT_EV_DEVICE_UNBLOCKED        0x0016
+struct mgmt_ev_device_unblocked {
+        bdaddr_t bdaddr;
+} __packed;
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index b4e7cde35365..b84458dcc226 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1312,59 +1312,41 @@ int hci_blacklist_clear(struct hci_dev *hdev)
 int hci_blacklist_add(struct hci_dev *hdev, bdaddr_t *bdaddr)
 {
         struct bdaddr_list *entry;
-        int err;
 
         if (bacmp(bdaddr, BDADDR_ANY) == 0)
                 return -EBADF;
 
-        hci_dev_lock_bh(hdev);
-
-        if (hci_blacklist_lookup(hdev, bdaddr)) {
-                err = -EEXIST;
-                goto err;
-        }
+        if (hci_blacklist_lookup(hdev, bdaddr))
+                return -EEXIST;
 
         entry = kzalloc(sizeof(struct bdaddr_list), GFP_KERNEL);
-        if (!entry) {
-                err = -ENOMEM;
-                goto err;
-        }
+        if (!entry)
+                return -ENOMEM;
 
         bacpy(&entry->bdaddr, bdaddr);
 
         list_add(&entry->list, &hdev->blacklist);
 
-        err = 0;
-
-err:
-        hci_dev_unlock_bh(hdev);
-        return err;
+        return mgmt_device_blocked(hdev->id, bdaddr);
 }
 
 int hci_blacklist_del(struct hci_dev *hdev, bdaddr_t *bdaddr)
 {
         struct bdaddr_list *entry;
-        int err = 0;
-
-        hci_dev_lock_bh(hdev);
 
         if (bacmp(bdaddr, BDADDR_ANY) == 0) {
-                hci_blacklist_clear(hdev);
-                goto done;
+                return hci_blacklist_clear(hdev);
         }
 
         entry = hci_blacklist_lookup(hdev, bdaddr);
         if (!entry) {
-                err = -ENOENT;
-                goto done;
+                return -ENOENT;
         }
 
         list_del(&entry->list);
         kfree(entry);
 
-done:
-        hci_dev_unlock_bh(hdev);
-        return err;
+        return mgmt_device_unblocked(hdev->id, bdaddr);
 }
 
 static void hci_clear_adv_cache(unsigned long arg)
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index ff02cf5e77cc..f6afe3d76a66 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -183,21 +183,35 @@ static int hci_sock_release(struct socket *sock)
 static int hci_sock_blacklist_add(struct hci_dev *hdev, void __user *arg)
 {
         bdaddr_t bdaddr;
+        int err;
 
         if (copy_from_user(&bdaddr, arg, sizeof(bdaddr)))
                 return -EFAULT;
 
-        return hci_blacklist_add(hdev, &bdaddr);
+        hci_dev_lock_bh(hdev);
+
+        err = hci_blacklist_add(hdev, &bdaddr);
+
+        hci_dev_unlock_bh(hdev);
+
+        return err;
 }
 
 static int hci_sock_blacklist_del(struct hci_dev *hdev, void __user *arg)
 {
         bdaddr_t bdaddr;
+        int err;
 
         if (copy_from_user(&bdaddr, arg, sizeof(bdaddr)))
                 return -EFAULT;
 
-        return hci_blacklist_del(hdev, &bdaddr);
+        hci_dev_lock_bh(hdev);
+
+        err = hci_blacklist_del(hdev, &bdaddr);
+
+        hci_dev_unlock_bh(hdev);
+
+        return err;
 }
 
 /* Ioctls that require bound socket */
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 6493e807634f..579f7261a7fe 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1698,13 +1698,12 @@ static int block_device(struct sock *sk, u16 index, unsigned char *data,
                                                                 u16 len)
 {
         struct hci_dev *hdev;
-        struct mgmt_cp_block_device *cp;
+        struct pending_cmd *cmd;
+        struct mgmt_cp_block_device *cp = (void *) data;
         int err;
 
         BT_DBG("hci%u", index);
 
-        cp = (void *) data;
-
         if (len != sizeof(*cp))
                 return cmd_status(sk, index, MGMT_OP_BLOCK_DEVICE,
                                                         EINVAL);
@@ -1714,6 +1713,14 @@ static int block_device(struct sock *sk, u16 index, unsigned char *data,
                 return cmd_status(sk, index, MGMT_OP_BLOCK_DEVICE,
                                                         ENODEV);
 
+        hci_dev_lock_bh(hdev);
+
+        cmd = mgmt_pending_add(sk, MGMT_OP_BLOCK_DEVICE, index, NULL, 0);
+        if (!cmd) {
+                err = -ENOMEM;
+                goto failed;
+        }
+
         err = hci_blacklist_add(hdev, &cp->bdaddr);
 
         if (err < 0)
@@ -1721,6 +1728,11 @@ static int block_device(struct sock *sk, u16 index, unsigned char *data,
         else
                 err = cmd_complete(sk, index, MGMT_OP_BLOCK_DEVICE,
                                                         NULL, 0);
+
+        mgmt_pending_remove(cmd);
+
+failed:
+        hci_dev_unlock_bh(hdev);
         hci_dev_put(hdev);
 
         return err;
@@ -1730,13 +1742,12 @@ static int unblock_device(struct sock *sk, u16 index, unsigned char *data,
                                                                 u16 len)
 {
         struct hci_dev *hdev;
-        struct mgmt_cp_unblock_device *cp;
+        struct pending_cmd *cmd;
+        struct mgmt_cp_unblock_device *cp = (void *) data;
         int err;
 
         BT_DBG("hci%u", index);
 
-        cp = (void *) data;
-
         if (len != sizeof(*cp))
                 return cmd_status(sk, index, MGMT_OP_UNBLOCK_DEVICE,
                                                                 EINVAL);
@@ -1746,6 +1757,14 @@ static int unblock_device(struct sock *sk, u16 index, unsigned char *data,
                 return cmd_status(sk, index, MGMT_OP_UNBLOCK_DEVICE,
                                                                 ENODEV);
 
+        hci_dev_lock_bh(hdev);
+
+        cmd = mgmt_pending_add(sk, MGMT_OP_UNBLOCK_DEVICE, index, NULL, 0);
+        if (!cmd) {
+                err = -ENOMEM;
+                goto failed;
+        }
+
         err = hci_blacklist_del(hdev, &cp->bdaddr);
 
         if (err < 0)
@@ -1753,6 +1772,11 @@ static int unblock_device(struct sock *sk, u16 index, unsigned char *data,
         else
                 err = cmd_complete(sk, index, MGMT_OP_UNBLOCK_DEVICE,
                                                                 NULL, 0);
+
+        mgmt_pending_remove(cmd);
+
+failed:
+        hci_dev_unlock_bh(hdev);
         hci_dev_put(hdev);
 
         return err;
@@ -2356,3 +2380,29 @@ int mgmt_discovering(u16 index, u8 discovering)
         return mgmt_event(MGMT_EV_DISCOVERING, index, &discovering,
                                                 sizeof(discovering), NULL);
 }
+
+int mgmt_device_blocked(u16 index, bdaddr_t *bdaddr)
+{
+        struct pending_cmd *cmd;
+        struct mgmt_ev_device_blocked ev;
+
+        cmd = mgmt_pending_find(MGMT_OP_BLOCK_DEVICE, index);
+
+        bacpy(&ev.bdaddr, bdaddr);
+
+        return mgmt_event(MGMT_EV_DEVICE_BLOCKED, index, &ev, sizeof(ev),
+                                                cmd ? cmd->sk : NULL);
+}
+
+int mgmt_device_unblocked(u16 index, bdaddr_t *bdaddr)
+{
+        struct pending_cmd *cmd;
+        struct mgmt_ev_device_unblocked ev;
+
+        cmd = mgmt_pending_find(MGMT_OP_UNBLOCK_DEVICE, index);
+
+        bacpy(&ev.bdaddr, bdaddr);
+
+        return mgmt_event(MGMT_EV_DEVICE_UNBLOCKED, index, &ev, sizeof(ev),
+                                                cmd ? cmd->sk : NULL);
+}