michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: Fix build warning with Warray-bounds

Browse source 
../zephyrNew/subsys/bluetooth/mesh/prov.c: In function
'bt_mesh_prov_reset_state': ../zephyrNew/subsys/bluetooth/mesh
/prov.c:61:2⚠️ '__builtin_memset' offset [52, 292] from
the object at 'bt_mesh_prov_link' is out of the bounds of referenced
subobject 'dhkey' with type 'uint8_t[32]' {aka 'unsigned char[32]'}
at offset 19 [-Warray-bounds] 61 | memset(&bt_mesh_prov_link.dhkey, 0,

Fixes: #29634

Signed-off-by: Lingao Meng <mengabc1086@gmail.com>
This commit is contained in:
Lingao Meng 2020-09-17 13:47:37 +08:00 • committed by Johan Hedberg
commit 0bcd66ac36
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
subsys/bluetooth/mesh/prov.c
View file

@ -50,6 +50,7 @@ int bt_mesh_prov_reset_state(void (*func)(const uint8_t key[64]))
{ {
int err; int err;
static struct bt_pub_key_cb pub_key_cb; static struct bt_pub_key_cb pub_key_cb;
const size_t offset = offsetof(struct bt_mesh_prov_link, dhkey);
pub_key_cb.func = func ? func : pub_key_ready; pub_key_cb.func = func ? func : pub_key_ready;
@ -58,8 +59,8 @@ int bt_mesh_prov_reset_state(void (*func)(const uint8_t key[64]))
bt_mesh_attention(NULL, 0); bt_mesh_attention(NULL, 0);
} }
memset(&bt_mesh_prov_link.dhkey, 0, (void)memset((uint8_t *)&bt_mesh_prov_link + offset, 0,
sizeof(bt_mesh_prov_link) - offsetof(struct bt_mesh_prov_link, dhkey)); sizeof(bt_mesh_prov_link) - offset);
err = bt_pub_key_gen(&pub_key_cb); err = bt_pub_key_gen(&pub_key_cb);
if (err) { if (err) {