about summary refs log tree commit diff
path: root/sysdeps/unix/sysv
diff options
context:
space:
mode:
authorXi Ruoyao <xry111@xry111.site>2024-01-04 21:41:20 +0800
committerAndreas K. Hüttel <dilfridge@gentoo.org>2024-01-12 14:23:11 +0100
commit5a85786a9005722be7cb9e70f8874a5f1130daea (patch)
treea16f92ad1183613e1311a6a35bfc2c91ef3f4382 /sysdeps/unix/sysv
parentf2b65a44714e8fa13c7637cd9413169590795879 (diff)
downloadglibc-5a85786a9005722be7cb9e70f8874a5f1130daea.tar.gz
glibc-5a85786a9005722be7cb9e70f8874a5f1130daea.tar.xz
glibc-5a85786a9005722be7cb9e70f8874a5f1130daea.zip
Make __getrandom_nocancel set errno and add a _nostatus version
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 <xry111@xry111.site>
Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
Diffstat (limited to 'sysdeps/unix/sysv')
-rw-r--r--sysdeps/unix/sysv/linux/not-cancel.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux/not-cancel.h
index 50483d9e74..2a7585b73f 100644
--- a/sysdeps/unix/sysv/linux/not-cancel.h
+++ b/sysdeps/unix/sysv/linux/not-cancel.h
@@ -86,6 +86,14 @@ __writev_nocancel_nostatus (int fd, const struct iovec *iov, int iovcnt)
 static inline ssize_t
 __getrandom_nocancel (void *buf, size_t buflen, unsigned int flags)
 {
+  return INLINE_SYSCALL_CALL (getrandom, buf, buflen, flags);
+}
+
+/* Non cancellable getrandom syscall that does not also set errno in case of
+   failure.  */
+static inline ssize_t
+__getrandom_nocancel_nostatus (void *buf, size_t buflen, unsigned int flags)
+{
   return INTERNAL_SYSCALL_CALL (getrandom, buf, buflen, flags);
 }