Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Update thread id validation returned by __wasi_thread_spawn #435

Merged
merged 1 commit into from
Sep 18, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions libc-top-half/musl/src/thread/pthread_create.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#endif

#include <stdalign.h>
#include <assert.h>

static void dummy_0()
{
Expand Down Expand Up @@ -558,13 +559,17 @@ int __pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict att
__wait(&args->control, 0, 3, 0);
}
#else
#define WASI_THREADS_MAX_TID 0x1FFFFFFF
/* `wasi_thread_spawn` will either return a host-provided thread ID (TID)
* (`>= 0`) or an error code (`< 0`). As in the unmodified version, all
* spawn failures translate to EAGAIN; unlike the modified version, there is
* no need to "start up" the child thread--the host does this. If the spawn
* did succeed, then we store the TID atomically, since this parent thread
* is racing with the child thread to set this field; this way, whichever
* thread reaches this point first can continue without waiting. */
* (`<1, 0x1FFFFFFF>`) or an error code (`< 0`). Please note that `0` is
* reserved for compatibility reasons and must not be returned by the runtime.
* As in the unmodified version, all spawn failures translate to EAGAIN;
* unlike the modified version, there is no need to "start up" the child
* thread--the host does this. If the spawn did succeed, then we store the
* TID atomically, since this parent thread is racing with the child thread
* to set this field; this way, whichever thread reaches this point first
* can continue without waiting. */
assert(ret != 0 && ret <= WASI_THREADS_MAX_TID);
if (ret < 0) {
ret = -EAGAIN;
} else {
Expand Down