Bluetooth: MGMT: Add conditions for setting HCI_CONN_FLAG_REMOTE_WAKEUP
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Thu, 12 May 2022 22:31:33 +0000 (15:31 -0700)
committerMarcel Holtmann <marcel@holtmann.org>
Fri, 13 May 2022 11:22:29 +0000 (13:22 +0200)
HCI_CONN_FLAG_REMOTE_WAKEUP can only be set if device can be programmed
in the allowlist which in case of device using RPA requires LL Privacy
support to be enabled.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=215768
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
net/bluetooth/mgmt.c

index d2d3905..74937a8 100644 (file)
@@ -4529,6 +4529,23 @@ static int set_device_flags(struct sock *sk, struct hci_dev *hdev, void *data,
                params = hci_conn_params_lookup(hdev, &cp->addr.bdaddr,
                                                le_addr_type(cp->addr.type));
                if (params) {
+                       DECLARE_BITMAP(flags, __HCI_CONN_NUM_FLAGS);
+
+                       bitmap_from_u64(flags, current_flags);
+
+                       /* Devices using RPAs can only be programmed in the
+                        * acceptlist LL Privacy has been enable otherwise they
+                        * cannot mark HCI_CONN_FLAG_REMOTE_WAKEUP.
+                        */
+                       if (test_bit(HCI_CONN_FLAG_REMOTE_WAKEUP, flags) &&
+                           !use_ll_privacy(hdev) &&
+                           hci_find_irk_by_addr(hdev, &params->addr,
+                                                params->addr_type)) {
+                               bt_dev_warn(hdev,
+                                           "Cannot set wakeable for RPA");
+                               goto unlock;
+                       }
+
                        bitmap_from_u64(params->flags, current_flags);
                        status = MGMT_STATUS_SUCCESS;
 
@@ -4545,6 +4562,7 @@ static int set_device_flags(struct sock *sk, struct hci_dev *hdev, void *data,
                }
        }
 
+unlock:
        hci_dev_unlock(hdev);
 
 done: