From: Samuel Thibault <samuel.thibault@ens-lyon.org>
To: libc-alpha@sourceware.org
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>, commit-hurd@gnu.org
Subject: [hurd,commited 2/2] hurd: Fix ld.so __access override from libc
Date: Sun, 01 Dec 2019 21:22:00 -0000 [thread overview]
Message-ID: <20191201212239.1176527-3-samuel.thibault@ens-lyon.org> (raw)
In-Reply-To: <20191201212239.1176527-1-samuel.thibault@ens-lyon.org>
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.
---
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 dbfa53dd94..f48da2c7a3 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 dc9fb9d5b2..9106a9f842 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 dc199bfd66..9dee71efa3 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 2b5de8ea03..5072742352 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 0c1cf0ffa9..b89e04b24a 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 690c99a856..f9fd6e64cf 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)
--
2.24.0
prev parent reply other threads:[~2019-12-01 21:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-01 21:22 [hurd,commited 0/2] hurd: Fix some ld.so overrides " Samuel Thibault
2019-12-01 21:22 ` [hurd,commited 1/2] hurd: Fix ld.so __getcwd override " Samuel Thibault
2019-12-01 21:22 ` Samuel Thibault [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191201212239.1176527-3-samuel.thibault@ens-lyon.org \
--to=samuel.thibault@ens-lyon.org \
--cc=commit-hurd@gnu.org \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).