kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-27 07:21:18 +01:00
Code Releases Activity

gnrc_netif_pktq: protect against concurrent access

Browse Source 
fixes #17924
This commit is contained in:
Benjamin Valentin 2022-05-31 23:37:29 +02:00
parent ac524e69b8
commit 61cc168ce1
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/net/gnrc/netif/pktq/gnrc_netif_pktq.c
View File

@ -23,16 +23,24 @@
#define ENABLE_DEBUG 0
#include "debug.h"
static mutex_t _pool_lock = MUTEX_INIT;
static gnrc_pktqueue_t _pool[CONFIG_GNRC_NETIF_PKTQ_POOL_SIZE];
static gnrc_pktqueue_t *_get_free_entry(void)
static gnrc_pktqueue_t *_get_free_entry(gnrc_pktsnip_t *pkt)
{
gnrc_pktqueue_t *entry = NULL;
mutex_lock(&_pool_lock);
for (unsigned i = 0; i < CONFIG_GNRC_NETIF_PKTQ_POOL_SIZE; i++) {
if (_pool[i].pkt == NULL) {
return &_pool[i];
_pool[i].pkt = pkt;
entry = &_pool[i];
break;
}
}
return NULL;
mutex_unlock(&_pool_lock);
return entry;
}
unsigned gnrc_netif_pktq_usage(void)
@ -52,12 +60,11 @@ int gnrc_netif_pktq_put(gnrc_netif_t *netif, gnrc_pktsnip_t *pkt)
assert(netif != NULL);
assert(pkt != NULL);
gnrc_pktqueue_t *entry = _get_free_entry();
gnrc_pktqueue_t *entry = _get_free_entry(pkt);
if (entry == NULL) {
return -1;
}
entry->pkt = pkt;
gnrc_pktqueue_add(&netif->send_queue.queue, entry);
return 0;
}
@ -94,12 +101,11 @@ int gnrc_netif_pktq_push_back(gnrc_netif_t *netif, gnrc_pktsnip_t *pkt)
assert(netif != NULL);
assert(pkt != NULL);
gnrc_pktqueue_t *entry = _get_free_entry();
gnrc_pktqueue_t *entry = _get_free_entry(pkt);
if (entry == NULL) {
return -1;
}
entry->pkt = pkt;
LL_PREPEND(netif->send_queue.queue, entry);
return 0;
}