michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Host: Fixes SMP issues

Browse source 
If the bonding information has been cleared before pairing had a chance
to complete (probably by the application), indicate this by setting an
appropriate log message.

Also check that keys exist before calling `bt_keys_store`.

Fixes #59788 and #61465

Signed-off-by: Théo Battrel <theo.battrel@nordicsemi.no>
This commit is contained in:
Théo Battrel 2023-09-01 10:26:05 +02:00 • committed by Carles Cufí
commit 8bd36fc589
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
subsys/bluetooth/host/smp.c
View file

@ -1650,11 +1650,11 @@ static void smp_pairing_complete(struct bt_smp *smp, uint8_t status)
LOG_DBG("got status 0x%x", status);
if (conn->state != BT_CONN_CONNECTED) {
/* If disconnection has been triggered in between the security update
* and the call to this function we need to abort the pairing.
if (conn->le.keys == NULL) {
/* We can get here if the application calls `bt_unpair` in the
* `security_changed` callback.
*/
LOG_WRN("Not connected!");
LOG_WRN("The in-progress pairing has been deleted!");
status = BT_SMP_ERR_UNSPECIFIED;
}
@ -1677,7 +1677,7 @@ static void smp_pairing_complete(struct bt_smp *smp, uint8_t status)
bt_keys_show_sniffer_info(conn->le.keys, NULL);
}
if (bond_flag) {
if (bond_flag && conn->le.keys) {
bt_keys_store(conn->le.keys);
}