From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 47677 invoked by alias); 1 Dec 2019 21:21:53 -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 47659 invoked by uid 9944); 1 Dec 2019 21:21:53 -0000 Date: Sun, 01 Dec 2019 21:21:00 -0000 Message-ID: <20191201212153.47658.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 ld.so __access override from libc X-Act-Checkin: glibc X-Git-Author: Samuel Thibault X-Git-Refname: refs/heads/master X-Git-Oldrev: db25266c9202a1235ce2e2f8a4f84cfb86254196 X-Git-Newrev: dd67928700bc9b5954c93b29a6e0b0c4b279d454 X-SW-Source: 2019-q4/txt/msg00504.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=dd67928700bc9b5954c93b29a6e0b0c4b279d454 commit dd67928700bc9b5954c93b29a6e0b0c4b279d454 Author: Samuel Thibault Date: Sun Dec 1 20:52:39 2019 +0000 hurd: Fix ld.so __access override from libc ld.so symbols to be overriden by libc need to be extern to really get overriden. __access happens to have never been exposed, putting it to GLIBC_PRIVATE. Diff: --- include/unistd.h | 3 ++- io/access.c | 1 + sysdeps/mach/hurd/Versions | 8 ++++---- sysdeps/mach/hurd/access.c | 1 + sysdeps/mach/hurd/i386/localplt.data | 2 +- sysdeps/unix/sysv/linux/access.c | 1 + 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/unistd.h b/include/unistd.h index dbfa53d..f48da2c 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -25,7 +25,8 @@ libc_hidden_proto (tcgetpgrp) libc_hidden_proto (readlinkat) /* Now define the internal interfaces. */ -extern int __access (const char *__name, int __type) attribute_hidden; +extern int __access (const char *__name, int __type); +libc_hidden_proto (__access) extern int __euidaccess (const char *__name, int __type); extern int __faccessat (int __fd, const char *__file, int __type, int __flag); extern int __faccessat_noerrno (int __fd, const char *__file, int __type, diff --git a/io/access.c b/io/access.c index dc9fb9d..9106a9f 100644 --- a/io/access.c +++ b/io/access.c @@ -39,6 +39,7 @@ __access (const char *file, int type) __set_errno (ENOSYS); return -1; } +libc_hidden_def (__access) stub_warning (access) weak_alias (__access, access) diff --git a/sysdeps/mach/hurd/Versions b/sysdeps/mach/hurd/Versions index dc199bf..9dee71e 100644 --- a/sysdeps/mach/hurd/Versions +++ b/sysdeps/mach/hurd/Versions @@ -1,7 +1,7 @@ libc { GLIBC_2.0 { # functions with a weak definition in the dynamic linker - __access; __mmap; + __mmap; } GLIBC_2.2.6 { # functions with a weak definition in the dynamic linker @@ -9,7 +9,7 @@ libc { } GLIBC_PRIVATE { # Functions shared with the dynamic linker - __access_noerrno; __libc_read; __libc_write; __libc_lseek64; + __access; __access_noerrno; __libc_read; __libc_write; __libc_lseek64; __libc_lock_self0; __sigprocmask; __getcwd; _dl_init_first; @@ -22,7 +22,7 @@ ld { __hurd_threadvar_stack_mask; __hurd_threadvar_stack_offset; # functions that must be shared with libc - __access; __close; __getpid; + __close; __getpid; __mmap; __open; __read; __sbrk; __strtoul_internal; __write; __writev; __xstat64; __fxstat64; _exit; _hurd_intr_rpc_mach_msg; @@ -40,7 +40,7 @@ ld { _dl_init_first; # functions that must be shared with libc - __access_noerrno; __libc_read; __libc_write; __libc_lseek64; + __access; __access_noerrno; __libc_read; __libc_write; __libc_lseek64; __libc_lock_self0; __sigprocmask; __getcwd; } } diff --git a/sysdeps/mach/hurd/access.c b/sysdeps/mach/hurd/access.c index 2b5de8e..5072742 100644 --- a/sysdeps/mach/hurd/access.c +++ b/sysdeps/mach/hurd/access.c @@ -35,4 +35,5 @@ __access (const char *file, int type) { return __faccessat (AT_FDCWD, file, type, 0); } +libc_hidden_def (__access) weak_alias (__access, access) diff --git a/sysdeps/mach/hurd/i386/localplt.data b/sysdeps/mach/hurd/i386/localplt.data index 0c1cf0f..b89e04b 100644 --- a/sysdeps/mach/hurd/i386/localplt.data +++ b/sysdeps/mach/hurd/i386/localplt.data @@ -32,7 +32,7 @@ ld.so: __libc_lseek64 ld.so: __mmap ld.so: __fxstat64 ld.so: __xstat64 -#ld.so: __access +ld.so: __access ld.so: __access_noerrno ld.so: __getpid ld.so: __getcwd diff --git a/sysdeps/unix/sysv/linux/access.c b/sysdeps/unix/sysv/linux/access.c index 690c99a..f9fd6e6 100644 --- a/sysdeps/unix/sysv/linux/access.c +++ b/sysdeps/unix/sysv/linux/access.c @@ -29,4 +29,5 @@ __access (const char *file, int type) return INLINE_SYSCALL_CALL (faccessat, AT_FDCWD, file, type); #endif } +libc_hidden_def (__access) weak_alias (__access, access)