]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
NonStop: Do not call sleep() with a 0 value
authorRandall S. Becker <randall.becker@nexbridge.ca>
Sat, 30 Mar 2024 22:28:02 +0000 (22:28 +0000)
committerTomas Mraz <tomas@openssl.org>
Fri, 5 Apr 2024 14:06:51 +0000 (16:06 +0200)
This change ensures that sleep(0) is not invoked to cause unexpected
duplicate thread context switches when _REENTRANT is specified.

Fixes: #24009
Signed-off-by: Randall S. Becker <randall.becker@nexbridge.ca>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24012)

crypto/sleep.c

index dc97d4edc051c917a6bb2722933f78dfdd79faa9..73467fb85933004ead97121bd582e248daca89b7 100644 (file)
@@ -31,7 +31,8 @@ void OSSL_sleep(uint64_t millis)
     unsigned int s = (unsigned int)(millis / 1000);
     unsigned int us = (unsigned int)((millis % 1000) * 1000);
 
-    sleep(s);
+    if (s > 0)
+        sleep(s);
     usleep(us);
 # endif
 }