michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: SMP: Check return value of bt_rand

Browse source 
Add check of bt_rand return value and do not proceed in case of error.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2020-11-02 12:37:57 +01:00 • committed by Carles Cufí
commit a01a619480
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1251,7 +1251,10 @@ static void smp_br_distribute_keys(struct bt_smp_br *smp)
info = net_buf_add(buf, sizeof(*info));
bt_rand(info->csrk, sizeof(info->csrk));
if (bt_rand(info->csrk, sizeof(info->csrk))) {
BT_ERR("Unable to get random bytes");
return;
}
if (atomic_test_bit(smp->flags, SMP_FLAG_BOND)) {
bt_keys_add_type(keys, BT_KEYS_LOCAL_CSRK);
@ -2048,7 +2051,10 @@ static void legacy_distribute_keys(struct bt_smp *smp)
uint8_t ediv[2];
} rand;
bt_rand((void *)&rand, sizeof(rand));
if (bt_rand((void *)&rand, sizeof(rand))) {
BT_ERR("Unable to get random bytes");
return;
}
buf = smp_create_pdu(smp, BT_SMP_CMD_ENCRYPT_INFO,
sizeof(*info));
@ -2158,7 +2164,9 @@ static uint8_t bt_smp_distribute_keys(struct bt_smp *smp)
info = net_buf_add(buf, sizeof(*info));
bt_rand(info->csrk, sizeof(info->csrk));
if (bt_rand(info->csrk, sizeof(info->csrk))) {
return BT_SMP_ERR_UNSPECIFIED;
}
if (atomic_test_bit(smp->flags, SMP_FLAG_BOND)) {
bt_keys_add_type(keys, BT_KEYS_LOCAL_CSRK);