michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: SMP: Fix bond lost on pairing failure.

Browse source 
Fix an an issue where established bonding information in the peripheral
are deleted when the central does not have the bond information.
This could be because the central has removed the bond information, or
this is in fact not the central but someone spoofing it's identity, or
an accidental RPA match.

This is a regression from: a3e89e84a8

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2020-04-03 23:03:58 +02:00 • committed by Johan Hedberg
commit 7ab754d997
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1823,10 +1823,13 @@ static void smp_pairing_complete(struct bt_smp *smp, u8_t status)
} else {
u8_t auth_err = auth_err_get(status);
/*
* Clear the key pool entry in case of pairing failure.
/* Clear the key pool entry in case of pairing failure if the
* keys already existed before the pairing procedure or the
* pairing failed during key distribution.
*/
if (smp->chan.chan.conn->le.keys) {
if (smp->chan.chan.conn->le.keys &&
(!smp->chan.chan.conn->le.keys->enc_size ||
atomic_test_bit(smp->flags, SMP_FLAG_KEYS_DISTR))) {
bt_keys_clear(smp->chan.chan.conn->le.keys);
smp->chan.chan.conn->le.keys = NULL;
}