michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: Use ATOMIC_DEFINE instead of atomic_t

Browse source 
atomic_*_bit functions work with atomic_t arg as with array, therefore
the atomic variable should be declared using ATOMIC_DEFINE.

Coverity-CID: 333358
Fixes #65588

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
This commit is contained in:
Pavel Vasilyev 2023-11-23 15:48:11 +01:00 • committed by Carles Cufí
commit 362924a693
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
subsys/bluetooth/mesh/rpl.c
View file

@ -41,8 +41,9 @@ static ATOMIC_DEFINE(store, CONFIG_BT_MESH_CRPL);
enum { enum {
PENDING_CLEAR, PENDING_CLEAR,
PENDING_RESET, PENDING_RESET,
RPL_FLAGS_COUNT,
}; };
static atomic_t rpl_flags; static ATOMIC_DEFINE(rpl_flags, RPL_FLAGS_COUNT);
static inline int rpl_idx(const struct bt_mesh_rpl *rpl) static inline int rpl_idx(const struct bt_mesh_rpl *rpl)
{ {
@ -133,7 +134,7 @@ bool bt_mesh_rpl_check(struct bt_mesh_net_rx *rx,
/* Existing slot for given address */ /* Existing slot for given address */
if (rpl->src == rx->ctx.addr) { if (rpl->src == rx->ctx.addr) {
if (!rpl->old_iv && if (!rpl->old_iv &&
atomic_test_bit(&rpl_flags, PENDING_RESET) && atomic_test_bit(rpl_flags, PENDING_RESET) &&
!atomic_test_bit(store, i)) { !atomic_test_bit(store, i)) {
/* Until rpl reset is finished, entry with old_iv == false and /* Until rpl reset is finished, entry with old_iv == false and
* without "store" bit set will be removed, therefore it can be * without "store" bit set will be removed, therefore it can be
@ -178,7 +179,7 @@ void bt_mesh_rpl_clear(void)
return; return;
} }
atomic_set_bit(&rpl_flags, PENDING_CLEAR); atomic_set_bit(rpl_flags, PENDING_CLEAR);
bt_mesh_settings_store_schedule(BT_MESH_SETTINGS_RPL_PENDING); bt_mesh_settings_store_schedule(BT_MESH_SETTINGS_RPL_PENDING);
} }
@ -233,7 +234,7 @@ void bt_mesh_rpl_reset(void)
} }
if (i != 0) { if (i != 0) {
atomic_set_bit(&rpl_flags, PENDING_RESET); atomic_set_bit(rpl_flags, PENDING_RESET);
bt_mesh_settings_store_schedule(BT_MESH_SETTINGS_RPL_PENDING); bt_mesh_settings_store_schedule(BT_MESH_SETTINGS_RPL_PENDING);
} }
} else { } else {
@ -358,8 +359,8 @@ void bt_mesh_rpl_pending_store(uint16_t addr)
bt_mesh_settings_store_cancel(BT_MESH_SETTINGS_RPL_PENDING); bt_mesh_settings_store_cancel(BT_MESH_SETTINGS_RPL_PENDING);
} }
clr = atomic_test_and_clear_bit(&rpl_flags, PENDING_CLEAR); clr = atomic_test_and_clear_bit(rpl_flags, PENDING_CLEAR);
rst = atomic_test_bit(&rpl_flags, PENDING_RESET); rst = atomic_test_bit(rpl_flags, PENDING_RESET);
for (int i = 0; i < ARRAY_SIZE(replay_list); i++) { for (int i = 0; i < ARRAY_SIZE(replay_list); i++) {
struct bt_mesh_rpl *rpl = &replay_list[i]; struct bt_mesh_rpl *rpl = &replay_list[i];
@ -398,7 +399,7 @@ void bt_mesh_rpl_pending_store(uint16_t addr)
} }
} }
atomic_clear_bit(&rpl_flags, PENDING_RESET); atomic_clear_bit(rpl_flags, PENDING_RESET);
if (addr == BT_MESH_ADDR_ALL_NODES) { if (addr == BT_MESH_ADDR_ALL_NODES) {
(void)memset(&replay_list[last - shift + 1], 0, sizeof(struct bt_mesh_rpl) * shift); (void)memset(&replay_list[last - shift + 1], 0, sizeof(struct bt_mesh_rpl) * shift);