Bluetooth: Bind the SMP channel registration to management power state

When the controller gets powered on via the management interface, then
register the supported SMP channels. There is no point in registering
these channels earlier since it is not know what identity address the
controller is going to operate with.

When powering down a controller unregister all SMP channels. This is
required since a powered down controller is allowed to change its
identity address.

In addition the SMP channels are only available when the controller
is powered via the management interface. When using legacy ioctl, then
Bluetooth Low Energy is not supported and registering kernel side SMP
integration may actually cause confusion.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index c04197347c90201d463123318b531dff642f316c..34c17a0645ce874c350328adb7c478d47ae7f98e 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -933,10 +933,8 @@ static int __hci_init(struct hci_dev *hdev)
        if (lmp_bredr_capable(hdev))
                hci_debugfs_create_bredr(hdev);
 
-       if (lmp_le_capable(hdev)) {
+       if (lmp_le_capable(hdev))
                hci_debugfs_create_le(hdev);
-               smp_register(hdev);
-       }
 
        return 0;
 }
@@ -2133,6 +2131,8 @@ static void hci_power_off(struct work_struct *work)
        BT_DBG("%s", hdev->name);
 
        hci_dev_do_close(hdev);
+
+       smp_unregister(hdev);
 }
 
 static void hci_discov_off(struct work_struct *work)

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index cae612658ba9f27891a24f5fc2cd0a8d777ebdfb..f5c4d2eed9a18e9b5e8b71659ed06d8eda4fd8ed 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -6232,6 +6232,15 @@ static void powered_complete(struct hci_dev *hdev, u8 status, u16 opcode)
 
        BT_DBG("status 0x%02x", status);
 
+       if (!status) {
+               /* Register the available SMP channels (BR/EDR and LE) only
+                * when successfully powering on the controller. This late
+                * registration is required so that LE SMP can clearly
+                * decide if the public address or static address is used.
+                */
+               smp_register(hdev);
+       }
+
        hci_dev_lock(hdev);
 
        mgmt_pending_foreach(MGMT_OP_SET_POWERED, hdev, settings_rsp, &match);