]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
stdlib: fix arc4random fallback to /dev/urandom (BZ 31612)
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>
Fri, 5 Apr 2024 13:27:29 +0000 (10:27 -0300)
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>
Mon, 8 Jul 2024 13:05:10 +0000 (10:05 -0300)
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 <xry111@xry111.site>
stdlib/arc4random.c

index 3ae8fc130234b04ddd1ba49da6659c6438ea9331..7818cb9cf66e0f3b428a974c90bee1f120668561 100644 (file)
@@ -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 ();
     }