michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: Fix tx seg buffer with NULL pointer reference

Browse source 
Fix tx seg buffer with NULL pointer reference if enable mesh friendly

Signed-off-by: chao an <anchao@xiaomi.com>
This commit is contained in:
chao an 2020-07-30 11:29:15 +08:00 • committed by Johan Hedberg
commit 5328adcff5
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
subsys/bluetooth/mesh/transport.c
View file

@ -532,6 +532,8 @@ static int send_seg(struct bt_mesh_net_tx *net_tx, struct net_buf_simple *sdu,
BT_DBG("seg %u: %s", seg_o, bt_hex(buf, len));
tx->seg[seg_o] = buf;
if (IS_ENABLED(CONFIG_BT_MESH_FRIEND)) {
enum bt_mesh_friend_pdu_type type;
@ -552,11 +554,11 @@ static int send_seg(struct bt_mesh_net_tx *net_tx, struct net_buf_simple *sdu,
* out through the Friend Queue.
*/
k_mem_slab_free(&segs, &buf);
continue;
tx->seg[seg_o] = NULL;
}
}
tx->seg[seg_o] = buf;
}
/* This can happen if segments only went into the Friend Queue */