michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: bluetooth: hci: Fix userchan insufficient buf cause dead-loop.

Browse source 
If insufficient buf for given event, will cause dead-loop.

Signed-off-by: Lingao Meng <menglingao@xiaomi.com>
This commit is contained in:
Lingao Meng 2024-03-21 09:30:47 +08:00 • committed by Anas Nashif
commit 137efd1c30
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/bluetooth/hci/userchan.c
View file

@ -220,7 +220,7 @@ static void rx_thread(void *p1, void *p2, void *p3)
buf = get_rx(frame_start); buf = get_rx(frame_start);
if (!buf) { if (!buf) {
LOG_DBG("Discard adv report due to insufficient buf"); LOG_DBG("Discard adv report due to insufficient buf");
continue; goto next;
} }
buf_tailroom = net_buf_tailroom(buf); buf_tailroom = net_buf_tailroom(buf);
@ -229,7 +229,7 @@ static void rx_thread(void *p1, void *p2, void *p3)
LOG_ERR("Not enough space in buffer %zu/%zu", LOG_ERR("Not enough space in buffer %zu/%zu",
buf_add_len, buf_tailroom); buf_add_len, buf_tailroom);
net_buf_unref(buf); net_buf_unref(buf);
continue; goto next;
} }
net_buf_add_mem(buf, frame_start + sizeof(packet_type), buf_add_len); net_buf_add_mem(buf, frame_start + sizeof(packet_type), buf_add_len);
@ -237,6 +237,8 @@ static void rx_thread(void *p1, void *p2, void *p3)
LOG_DBG("Calling bt_recv(%p)", buf); LOG_DBG("Calling bt_recv(%p)", buf);
bt_recv(buf); bt_recv(buf);
next:
len -= decoded_len; len -= decoded_len;
frame_start += decoded_len; frame_start += decoded_len;
} }