espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-10-14 17:57:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

nimble/host: Fix check for valid static random address

Browse Source
This commit is contained in:
Prasad Alatkar
2020-03-09 12:04:44 +01:00
committed by Szymon Janc
parent 4931bbdccb
commit 11f16a0ee2
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/src/ble_hs_id.c
+13 -5
View File
@@ -58,14 +58,24 @@ ble_hs_id_set_rnd(const uint8_t *rnd_addr)
{ {
uint8_t addr_type_byte; uint8_t addr_type_byte;
int rc; int rc;
uint8_t all_zeros[BLE_DEV_ADDR_LEN] = {0}, all_ones[BLE_DEV_ADDR_LEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; int ones;
ble_hs_lock(); ble_hs_lock();
/* Make sure all bits are neither one nor zero */ /* Make sure random part of rnd_addr is not all ones or zeros. Reference:
* Core v5.0, Vol 6, Part B, section 1.3.2.1 */
addr_type_byte = rnd_addr[5] & 0xc0; addr_type_byte = rnd_addr[5] & 0xc0;
/* count bits set to 1 in random part of address */
ones = __builtin_popcount(rnd_addr[0]);
ones += __builtin_popcount(rnd_addr[1]);
ones += __builtin_popcount(rnd_addr[2]);
ones += __builtin_popcount(rnd_addr[3]);
ones += __builtin_popcount(rnd_addr[4]);
ones += __builtin_popcount(rnd_addr[5] & 0x3f);
if ((addr_type_byte != 0x00 && addr_type_byte != 0xc0) || if ((addr_type_byte != 0x00 && addr_type_byte != 0xc0) ||
!memcmp(rnd_addr, all_zeros, BLE_DEV_ADDR_LEN) || !memcmp(rnd_addr, all_ones, BLE_DEV_ADDR_LEN)) { (ones == 0 || ones == 46)) {
rc = BLE_HS_EINVAL; rc = BLE_HS_EINVAL;
goto done; goto done;
} }
@@ -77,8 +87,6 @@ ble_hs_id_set_rnd(const uint8_t *rnd_addr)
memcpy(ble_hs_id_rnd, rnd_addr, 6); memcpy(ble_hs_id_rnd, rnd_addr, 6);
rc = 0;
done: done:
ble_hs_unlock(); ble_hs_unlock();
return rc; return rc;