From: Randall S. Becker <randall.becker@nexbridge.ca>
Date: Sat, 30 Mar 2024 22:28:02 +0000 (+0000)
Subject: NonStop: Do not call sleep() with a 0 value
X-Git-Tag: openssl-3.4.0-alpha1~747
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d2a5f600c7b6bef6fa6cf720204876560a6194b;p=thirdparty%2Fopenssl.git

NonStop: Do not call sleep() with a 0 value

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)

(cherry picked from commit c89fe574493f438dd0e94bb9a89227e4ca84c0b7)
---

diff --git a/crypto/sleep.c b/crypto/sleep.c
index ce75c7a0330..0d6432262c1 100644
--- a/crypto/sleep.c
+++ b/crypto/sleep.c
@@ -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
 }