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

sys/suit: Ensure previous thread is stopped before reusing its stack

Browse Source 
Closes: https://github.com/RIOT-OS/RIOT/issues/19195
This commit is contained in:
chrysn 2023-01-25 18:01:14 +01:00
parent d6f44f6206
commit 2c716d3ede
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/suit/transport/worker.c
View File

@ -79,6 +79,8 @@ static char _url[CONFIG_SOCK_URLPATH_MAXLEN];
static uint8_t _manifest_buf[SUIT_MANIFEST_BUFSIZE]; static uint8_t _manifest_buf[SUIT_MANIFEST_BUFSIZE];
static mutex_t _worker_lock; static mutex_t _worker_lock;
/* PID of the worker thread, guarded by */
static kernel_pid_t _worker_pid = KERNEL_PID_UNDEF;
int suit_handle_url(const char *url) int suit_handle_url(const char *url)
{ {
@ -154,17 +156,27 @@ static void *_suit_worker_thread(void *arg)
} }
mutex_unlock(&_worker_lock); mutex_unlock(&_worker_lock);
thread_zombify();
/* Actually unreachable, given we're in a thread */
return NULL; return NULL;
} }
void suit_worker_trigger(const char *url, size_t len) void suit_worker_trigger(const char *url, size_t len)
{ {
mutex_lock(&_worker_lock); mutex_lock(&_worker_lock);
if (_worker_pid != KERNEL_PID_UNDEF) {
if (thread_kill_zombie(_worker_pid) != 1) {
/* This will only happen if the SUIT thread runs on a lower
* priority than the caller */
LOG_WARNING("Ignoring SUIT trigger: worker is still busy.\n");
return;
}
}
memcpy(_url, url, len); memcpy(_url, url, len);
_url[len] = '\0'; _url[len] = '\0';
thread_create(_stack, SUIT_WORKER_STACKSIZE, SUIT_COAP_WORKER_PRIO, _worker_pid = thread_create(_stack, SUIT_WORKER_STACKSIZE, SUIT_COAP_WORKER_PRIO,
THREAD_CREATE_STACKTEST, THREAD_CREATE_STACKTEST,
_suit_worker_thread, NULL, "suit worker"); _suit_worker_thread, NULL, "suit worker");
} }