From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 91818385151D; Wed, 26 Oct 2022 15:08:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 91818385151D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666796890; bh=tv02OfkPrvpvUm6I4EL7aggSeNih9fqeqxfdernINZI=; h=From:To:Subject:Date:From; b=T4shyA3ALMG8MjPIK0kKvB1ILaXXnXtpqvL3ezspyWe/fZF1cBrGdxXVESvUEmqkR SHZ4WIdbssfiTcd4qjFA/daC8B/BrqgmOvaNrd5u3MBFJSJfwMF0yHQB9cLDCq7XTD 7iu4x1xUR9lsATUcAiIKmFt2aurt0yRyHseUA6to= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] stdlib: Fix __getrandom_nocancel type and arc4random usage (BZ #29638) X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 227c9035872fc9e9e2cf56ec8f89219747ee19bc X-Git-Newrev: 76e05613ee28f4ac4a0ab97effc32e0e78e37a56 Message-Id: <20221026150810.91818385151D@sourceware.org> Date: Wed, 26 Oct 2022 15:08:10 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=76e05613ee28f4ac4a0ab97effc32e0e78e37a56 commit 76e05613ee28f4ac4a0ab97effc32e0e78e37a56 Author: Adhemerval Zanella Date: Thu Sep 29 16:15:20 2022 -0300 stdlib: Fix __getrandom_nocancel type and arc4random usage (BZ #29638) Using an unsigned type prevents the fallback to be used if kernel does not support getrandom syscall. Checked on x86_64-linux-gnu. Reviewed-by: Wilco Dijkstra (cherry picked from commit 13db9ee2cb3b77e25f852be7d6952882e1be6f00) Diff: --- NEWS | 1 + stdlib/arc4random.c | 2 +- sysdeps/unix/sysv/linux/not-cancel.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 1cc9a16bbf..91bcfeb7a6 100644 --- a/NEWS +++ b/NEWS @@ -28,6 +28,7 @@ The following bugs are resolved with this release: [29537] libc: [2.34 regression]: Alignment issue on m68k when using [29539] libc: LD_TRACE_LOADED_OBJECTS changed how vDSO library are [29583] Use 64-bit interfaces in gconv_parseconfdir + [29638] libc: stdlib: arc4random fallback is never used Version 2.36 diff --git a/stdlib/arc4random.c b/stdlib/arc4random.c index e417ef624d..960a38f295 100644 --- a/stdlib/arc4random.c +++ b/stdlib/arc4random.c @@ -34,7 +34,7 @@ void __arc4random_buf (void *p, size_t n) { static int seen_initialized; - size_t l; + ssize_t l; int fd; if (n == 0) diff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux/not-cancel.h index a263d294b1..cf35c8bfc9 100644 --- a/sysdeps/unix/sysv/linux/not-cancel.h +++ b/sysdeps/unix/sysv/linux/not-cancel.h @@ -68,7 +68,7 @@ __writev_nocancel_nostatus (int fd, const struct iovec *iov, int iovcnt) INTERNAL_SYSCALL_CALL (writev, fd, iov, iovcnt); } -static inline int +static inline ssize_t __getrandom_nocancel (void *buf, size_t buflen, unsigned int flags) { return INLINE_SYSCALL_CALL (getrandom, buf, buflen, flags);