From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 119803 invoked by alias); 13 Dec 2019 10:12:08 -0000 Mailing-List: contact glibc-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: glibc-cvs-owner@sourceware.org List-Subscribe: Received: (qmail 119745 invoked by uid 9944); 13 Dec 2019 10:12:08 -0000 Date: Fri, 13 Dec 2019 10:12:00 -0000 Message-ID: <20191213101208.119743.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Samuel Thibault To: glibc-cvs@sourceware.org Subject: [glibc] hurd: Fix local PLT X-Act-Checkin: glibc X-Git-Author: Samuel Thibault X-Git-Refname: refs/heads/master X-Git-Oldrev: f7649d5780aa4682393b9daedd653e4d9c12784c X-Git-Newrev: 8eaf34eda256ba3647ed6e7ed5c7c9aa19955d17 X-SW-Source: 2019-q4/txt/msg00600.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=8eaf34eda256ba3647ed6e7ed5c7c9aa19955d17 commit 8eaf34eda256ba3647ed6e7ed5c7c9aa19955d17 Author: Samuel Thibault Date: Fri Dec 13 10:10:59 2019 +0100 hurd: Fix local PLT * include/sys/random.h (__getrandom): Add hidden prototype. * stdlib/getrandom.c (getrandom): Rename to hidden definition __getrandom. Add weak alias. * sysdeps/mach/hurd/getrandom.c (getrandom): Likewise. * sysdeps/unix/sysv/linux/getrandom.c (getrandom): Likewise. * sysdeps/mach/hurd/getentropy.c (getentropy): Use __getrandom instead of getrandom. Diff: --- include/sys/random.h | 10 ++++++++++ stdlib/getrandom.c | 6 ++++-- sysdeps/mach/hurd/getentropy.c | 2 +- sysdeps/mach/hurd/getrandom.c | 5 ++++- sysdeps/unix/sysv/linux/getrandom.c | 6 ++++-- 5 files changed, 23 insertions(+), 6 deletions(-) diff --git a/include/sys/random.h b/include/sys/random.h index b33d114..6aa313d 100644 --- a/include/sys/random.h +++ b/include/sys/random.h @@ -1 +1,11 @@ +#ifndef _SYS_RANDOM_H #include + +# ifndef _ISOMAC + +extern ssize_t __getrandom (void *__buffer, size_t __length, + unsigned int __flags) __wur; +libc_hidden_proto (__getrandom) + +# endif /* !_ISOMAC */ +#endif diff --git a/stdlib/getrandom.c b/stdlib/getrandom.c index 3cfbd0c..02b827c 100644 --- a/stdlib/getrandom.c +++ b/stdlib/getrandom.c @@ -22,10 +22,12 @@ /* Write up to LENGTH bytes of randomness starting at BUFFER. Return the number of bytes written, or -1 on error. */ ssize_t -getrandom (void *buffer, size_t length, unsigned int flags) +__getrandom (void *buffer, size_t length, unsigned int flags) { __set_errno (ENOSYS); return -1; } - stub_warning (getrandom) + +libc_hidden_def (__getrandom) +weak_alias (__getrandom, getrandom) diff --git a/sysdeps/mach/hurd/getentropy.c b/sysdeps/mach/hurd/getentropy.c index d55eec8..06175d9 100644 --- a/sysdeps/mach/hurd/getentropy.c +++ b/sysdeps/mach/hurd/getentropy.c @@ -41,7 +41,7 @@ getentropy (void *buffer, size_t length) while (buffer < end) { /* NB: No cancellation point. */ - ssize_t bytes = getrandom (buffer, end - buffer, 0); + ssize_t bytes = __getrandom (buffer, end - buffer, 0); if (bytes < 0) { if (errno == EINTR) diff --git a/sysdeps/mach/hurd/getrandom.c b/sysdeps/mach/hurd/getrandom.c index 0147aee..8bf42aa 100644 --- a/sysdeps/mach/hurd/getrandom.c +++ b/sysdeps/mach/hurd/getrandom.c @@ -24,7 +24,7 @@ /* Write up to LENGTH bytes of randomness starting at BUFFER. Return the number of bytes written, or -1 on error. */ ssize_t -getrandom (void *buffer, size_t length, unsigned int flags) +__getrandom (void *buffer, size_t length, unsigned int flags) { const char *random_source = "/dev/urandom"; size_t amount_read; @@ -41,3 +41,6 @@ getrandom (void *buffer, size_t length, unsigned int flags) __close_nocancel_nostatus(fd); return amount_read; } + +libc_hidden_def (__getrandom) +weak_alias (__getrandom, getrandom) diff --git a/sysdeps/unix/sysv/linux/getrandom.c b/sysdeps/unix/sysv/linux/getrandom.c index 122c695..83388b5 100644 --- a/sysdeps/unix/sysv/linux/getrandom.c +++ b/sysdeps/unix/sysv/linux/getrandom.c @@ -25,7 +25,7 @@ /* Write up to LENGTH bytes of randomness starting at BUFFER. Return the number of bytes written, or -1 on error. */ ssize_t -getrandom (void *buffer, size_t length, unsigned int flags) +__getrandom (void *buffer, size_t length, unsigned int flags) { return SYSCALL_CANCEL (getrandom, buffer, length, flags); } @@ -33,7 +33,7 @@ getrandom (void *buffer, size_t length, unsigned int flags) /* Always provide a definition, even if the kernel headers lack the system call number. */ ssize_t -getrandom (void *buffer, size_t length, unsigned int flags) +__getrandom (void *buffer, size_t length, unsigned int flags) { /* Ideally, we would add a cancellation point here, but we currently cannot do so inside libc. */ @@ -41,3 +41,5 @@ getrandom (void *buffer, size_t length, unsigned int flags) return -1; } #endif +libc_hidden_def (__getrandom) +weak_alias (__getrandom, getrandom)