espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-10-30 09:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

mesh: Fix tx seg buffer with NULL pointer reference

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

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

this is port of 9cc884a0d3c7a8ac4ddf476d714435f5a52e2016
This commit is contained in:
Krzysztof Kopyściński
2021-01-12 14:05:19 +01:00
committed by Łukasz Rymanowski
parent 052a034b4a
commit 8be692f6bb
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/mesh/src/transport.c
+3 -2
View File
@@ -530,6 +530,8 @@ static int send_seg(struct bt_mesh_net_tx *net_tx, struct os_mbuf *sdu,
memcpy(buf, net_buf_simple_pull_mem(sdu, len), len);
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;
@@ -550,11 +552,10 @@ static int send_seg(struct bt_mesh_net_tx *net_tx, struct os_mbuf *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 */