From 5a85786a9005722be7cb9e70f8874a5f1130daea Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Thu, 4 Jan 2024 21:41:20 +0800 Subject: Make __getrandom_nocancel set errno and add a _nostatus version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The __getrandom_nocancel function returns errors as negative values instead of errno. This is inconsistent with other _nocancel functions and it breaks "TEMP_FAILURE_RETRY (__getrandom_nocancel (p, n, 0))" in __arc4random_buf. Use INLINE_SYSCALL_CALL instead of INTERNAL_SYSCALL_CALL to fix this issue. But __getrandom_nocancel has been avoiding from touching errno for a reason, see BZ 29624. So add a __getrandom_nocancel_nostatus function and use it in tcache_key_initialize. Signed-off-by: Xi Ruoyao Reviewed-by: Adhemerval Zanella Signed-off-by: Andreas K. Hüttel --- malloc/malloc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'malloc') diff --git a/malloc/malloc.c b/malloc/malloc.c index 198e78a..bcb6e5b 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -3139,7 +3139,9 @@ static uintptr_t tcache_key; static void tcache_key_initialize (void) { - if (__getrandom_nocancel (&tcache_key, sizeof(tcache_key), GRND_NONBLOCK) + /* We need to use the _nostatus version here, see BZ 29624. */ + if (__getrandom_nocancel_nostatus (&tcache_key, sizeof(tcache_key), + GRND_NONBLOCK) != sizeof (tcache_key)) { tcache_key = random_bits (); -- cgit v1.1