Merge pull request #185 from flaviojs/fix-data-race-netio_rxl_add-net…

…io_rxl_remove Fix data race in netio_rxl_add and netio_rxl_remove.
GNS3 · Mar 24, 2024 · 2bac780 · 2bac780
2 parents d671df2 + e42e831
commit 2bac780
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/common/net_io.c b/common/net_io.c
@@ -1703,8 +1703,9 @@ int netio_rxl_add(netio_desc_t *nio,netio_rx_handler_t rx_handler,
 
    rxl->next = netio_rxl_add_list;
    netio_rxl_add_list = rxl;
-
-   pthread_cond_wait(&netio_rxl_cond,&netio_rxq_mutex);
+   while(netio_rxl_add_list != NULL) {
+      pthread_cond_wait(&netio_rxl_cond,&netio_rxq_mutex);
+   }
    NETIO_RXQ_UNLOCK();
    return(0);
 }
@@ -1715,7 +1716,9 @@ int netio_rxl_remove(netio_desc_t *nio)
    NETIO_RXQ_LOCK();
    nio->rxl_next = netio_rxl_remove_list;
    netio_rxl_remove_list = nio;
-   pthread_cond_wait(&netio_rxl_cond,&netio_rxq_mutex);
+   while(netio_rxl_remove_list != NULL) {
+      pthread_cond_wait(&netio_rxl_cond,&netio_rxq_mutex);
+   }
    NETIO_RXQ_UNLOCK();
    return(0);
 }