From c83d696ab8659df240550a6a98b4b7b7d759b9d0 Mon Sep 17 00:00:00 2001 From: Dominik Hassler Date: Wed, 7 Dec 2022 17:06:40 +0000 Subject: OS-8430 LX: FUTEX_WAIT_BITSET should support timeout being NULL Reviewed by: Dan McDonald --- usr/src/uts/common/brand/lx/syscall/lx_futex.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usr/src/uts/common/brand/lx/syscall/lx_futex.c b/usr/src/uts/common/brand/lx/syscall/lx_futex.c index d2148f60e0..b6244223f9 100644 --- a/usr/src/uts/common/brand/lx/syscall/lx_futex.c +++ b/usr/src/uts/common/brand/lx/syscall/lx_futex.c @@ -25,6 +25,7 @@ /* * Copyright 2020 Joyent, Inc. + * Copyright 2022 OmniOS Community Edition (OmniOSce) Association. */ #include @@ -1384,7 +1385,8 @@ lx_futex(uintptr_t addr, int op, int val, uintptr_t lx_timeout, case FUTEX_WAIT_BITSET: rval = futex_wait(&memid, (void *)addr, val, tptr, val3, - (op & FUTEX_CLOCK_REALTIME) ? B_FALSE : B_TRUE); + (tptr == NULL || (op & FUTEX_CLOCK_REALTIME) != 0) ? + B_FALSE : B_TRUE); break; case FUTEX_WAKE: -- cgit v1.2.3