patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

net: lwm2m: Fix seg-faults if a socket was closed in the meantime

Browse source 
Our application (posix-naive/debug) ran into segmentaion faults,
because the socket was closed between the "wait for sockets" and the
second if in the first loop. Added the check also to line 690
and 720.
The other uses of sock_ctx[i] are already checked against NULL

Signed-off-by: Peter Tönz <peter.tonz@husqvarnagroup.com>
This commit is contained in:
Peter Tönz 2022-10-11 16:57:21 +02:00 committed by Carles Cufí
parent 9973dc59cf
commit 46a59124dc
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
subsys/net/lib/lwm2m/lwm2m_engine.c
View file

@ -687,13 +687,15 @@ static void socket_loop(void)
}
for (i = 0; i < sock_nfds; ++i) {
if (sys_slist_is_empty(&sock_ctx[i]->pending_sends)) {
if (sock_ctx[i] != NULL &&
sys_slist_is_empty(&sock_ctx[i]->pending_sends)) {
next_retransmit = retransmit_request(sock_ctx[i], timestamp);
if (next_retransmit < timeout) {
timeout = next_retransmit;
}
}
if (sys_slist_is_empty(&sock_ctx[i]->pending_sends) &&
if (sock_ctx[i] != NULL &&
sys_slist_is_empty(&sock_ctx[i]->pending_sends) &&
lwm2m_rd_client_is_registred(sock_ctx[i])) {
check_notifications(sock_ctx[i], timestamp);
}
@ -715,7 +717,7 @@ static void socket_loop(void)
for (i = 0; i < sock_nfds; i++) {
if (sock_ctx[i]->sock_fd < 0) {
if (sock_ctx[i] != NULL && sock_ctx[i]->sock_fd < 0) {
continue;
}