From 184b9e530e6326e668709826903b6d30dc6cac3f Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Fri, 5 Apr 2024 10:27:29 -0300 Subject: [PATCH] stdlib: fix arc4random fallback to /dev/urandom (BZ 31612) The __getrandom_nocancel used by __arc4random_buf uses INLINE_SYSCALL_CALL (which returns -1/errno) and the loop checks for the return value instead of errno to fallback to /dev/urandom. The malloc code now uses __getrandom_nocancel_nostatus, which uses INTERNAL_SYSCALL_CALL, so there is no need to use the variant that does not set errno (BZ#29624). Checked on x86_64-linux-gnu. Reviewed-by: Xi Ruoyao --- stdlib/arc4random.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/arc4random.c b/stdlib/arc4random.c index 3ae8fc13023..7818cb9cf66 100644 --- a/stdlib/arc4random.c +++ b/stdlib/arc4random.c @@ -51,7 +51,7 @@ __arc4random_buf (void *p, size_t n) n -= l; continue; /* Interrupted by a signal; keep going. */ } - else if (l == -ENOSYS) + else if (l < 0 && errno == ENOSYS) break; /* No syscall, so fallback to /dev/urandom. */ arc4random_getrandom_failure (); }