michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: SMP: Fix failing to pass SM/MAS/PROT/BV-01-C

Browse source 
smp_pairing_complete does actually clears flags so setting
SMP_FLAG_TIMEOUT must come after that.

Fixes #22786

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Luiz Augusto von Dentz 2020-02-13 14:09:56 -08:00 • committed by Johan Hedberg
commit 1156412904
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1761,6 +1761,9 @@ static void smp_reset(struct bt_smp *smp)
} }
} }
/* Note: This function not only does set the status but also calls smp_reset
* at the end which clears any flags previously set.
*/
static void smp_pairing_complete(struct bt_smp *smp, u8_t status) static void smp_pairing_complete(struct bt_smp *smp, u8_t status)
{ {
BT_DBG("status 0x%x", status); BT_DBG("status 0x%x", status);
@ -1816,9 +1819,12 @@ static void smp_timeout(struct k_work *work)
BT_ERR("SMP Timeout"); BT_ERR("SMP Timeout");
atomic_set_bit(smp->flags, SMP_FLAG_TIMEOUT);
smp_pairing_complete(smp, BT_SMP_ERR_UNSPECIFIED); smp_pairing_complete(smp, BT_SMP_ERR_UNSPECIFIED);
/* smp_pairing_complete clears flags so setting timeout flag must come
* after it.
*/
atomic_set_bit(smp->flags, SMP_FLAG_TIMEOUT);
} }
static void smp_send(struct bt_smp *smp, struct net_buf *buf, static void smp_send(struct bt_smp *smp, struct net_buf *buf,