diff options
| author |   Marcel Holtmann <marcel@holtmann.org> | 2015-01-15 08:04:21 -0800 |
|---|---|---|
| committer |   Johan Hedberg <johan.hedberg@intel.com> | 2015-01-15 21:59:38 +0200 |
| commit | 2b8df323953bfbeb8289c56f43b7fcfa4c70e90a (patch) | |
| tree | efd11e0318af870634cf46514862d0f55238855b /net/bluetooth | |
| parent | Bluetooth: Fix lookup of fixed channels by local bdaddr (diff) | |
| download | linux-dev-2b8df323953bfbeb8289c56f43b7fcfa4c70e90a.tar.xz linux-dev-2b8df323953bfbeb8289c56f43b7fcfa4c70e90a.zip | |
Bluetooth: Add paranoid check for existing LE and BR/EDR SMP channels
When the SMP channels have been already registered, then print out a
clear WARN_ON message that something went wrong. Also unregister the
existing channels in this case before trying to register new ones.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/smp.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index 08a9314f3ca7..37d9180bfe1c 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c @@ -3072,6 +3072,12 @@ int smp_register(struct hci_dev *hdev) if (!lmp_le_capable(hdev)) return 0; + if (WARN_ON(hdev->smp_data)) { + chan = hdev->smp_data; + hdev->smp_data = NULL; + smp_del_chan(chan); + } + chan = smp_add_cid(hdev, L2CAP_CID_SMP); if (IS_ERR(chan)) return PTR_ERR(chan); @@ -3091,6 +3097,12 @@ int smp_register(struct hci_dev *hdev) return 0; } + if (WARN_ON(hdev->smp_bredr_data)) { + chan = hdev->smp_bredr_data; + hdev->smp_bredr_data = NULL; + smp_del_chan(chan); + } + chan = smp_add_cid(hdev, L2CAP_CID_SMP_BREDR); if (IS_ERR(chan)) { int err = PTR_ERR(chan); |