Remove __access_noerrno

A recent commit, apparently commit
6c6fce572fb8f583f14d898e54fd7d25ae91cf56 "elf: Remove /etc/suid-debug
support", resulted in localplt failures for i686-gnu and x86_64-gnu:

Missing required PLT reference: ld.so: __access_noerrno

After that commit, __access_noerrno is actually no longer used at all.
So rather than just removing the localplt expectation for that symbol
for Hurd, completely remove all definitions of and references to that
symbol.

Tested for x86_64, and with build-many-glibcs.py for i686-gnu and
x86_64-gnu.

diff --git a/io/access.c b/io/access.c
index 29b8fdce89e00f3bd190fd3ca60e8b7897efde29..06a3900a45aa19859795278dba6b94c8d4440536 100644 (file)
--- a/io/access.c
+++ b/io/access.c
@@ -19,13 +19,6 @@
 #include <stddef.h>
 #include <unistd.h>
 
-/* Test for access to FILE without setting errno.   */
-int
-__access_noerrno (const char *file, int type)
-{
-  return -1;
-}
-
 /* Test for access to FILE.  */
 int
 __access (const char *file, int type)

diff --git a/sysdeps/generic/not-errno.h b/sysdeps/generic/not-errno.h
index 303f8a68a8dcf23310212b8c3479b722be0f975a..16ae34b42fb80d4abcc7db1d0b23c6d14f8940fb 100644 (file)
--- a/sysdeps/generic/not-errno.h
+++ b/sysdeps/generic/not-errno.h
@@ -16,6 +16,4 @@
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
-extern __typeof (__access) __access_noerrno attribute_hidden;
-
 extern __typeof (__kill) __kill_noerrno attribute_hidden;

diff --git a/sysdeps/mach/hurd/Versions b/sysdeps/mach/hurd/Versions
index 20ac0067c7b7479571a92fd53cea1ac695a29309..17592d356931d6d9fbd4fd8165b0c480664ca778 100644 (file)
--- a/sysdeps/mach/hurd/Versions
+++ b/sysdeps/mach/hurd/Versions
@@ -15,7 +15,7 @@ libc {
   }
   GLIBC_PRIVATE {
     # Functions shared with the dynamic linker
-    __access; __access_noerrno; __libc_read; __libc_write; __libc_lseek64;
+    __access; __libc_read; __libc_write; __libc_lseek64;
     __close_nocancel;
     __open_nocancel;
     __read_nocancel; __pread64_nocancel;
@@ -56,7 +56,7 @@ ld {
     _dl_init_first;
 
     # functions that must be shared with libc
-    __access; __access_noerrno; __libc_read; __libc_write; __libc_lseek64;
+    __access; __libc_read; __libc_write; __libc_lseek64;
     __close_nocancel;
     __open_nocancel;
     __read_nocancel; __pread64_nocancel;

diff --git a/sysdeps/mach/hurd/access.c b/sysdeps/mach/hurd/access.c
index 9e8b9014a75585a2d1e477a45c55a87fc9f93835..87a15e5a8b18c8bdefabdce9bd4cb2c1efb73fce 100644 (file)
--- a/sysdeps/mach/hurd/access.c
+++ b/sysdeps/mach/hurd/access.c
@@ -19,16 +19,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-/* Test for access to FILE by our real user and group IDs without setting
-   errno.  This may be unsafe to run during initialization of tunables
-   since access_common calls __hurd_file_name_lookup, which calls
-   __hurd_file_name_lookup_retry, which can set errno.  */
-int
-__access_noerrno (const char *file, int type)
-{
-  return __faccessat_noerrno (AT_FDCWD, file, type, 0);
-}
-
 /* Test for access to FILE by our real user and group IDs.  */
 int
 __access (const char *file, int type)

diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
index 6994f8f7b665eab56e263e3d8b2af465e256b87a..38e55acc43e7bbbbdf72e50e1e784bb9b642fc1d 100644 (file)
--- a/sysdeps/mach/hurd/dl-sysdep.c
+++ b/sysdeps/mach/hurd/dl-sysdep.c
@@ -542,22 +542,15 @@ __stat64 (const char *file, struct stat64 *buf)
 }
 libc_hidden_def (__stat64)
 
-/* This function is called by the dynamic linker (rtld.c) to check
-   whether debugging malloc is allowed even for SUID binaries.  This
-   stub will always fail, which means that malloc-debugging is always
-   disabled for SUID binaries.  */
+/* This function is called by the dynamic linker (rtld.c) to check for
+   existence of /etc/ld.so.preload.  This stub will always fail, which
+   means that /etc/ld.so.preload is unsupported.  */
 check_no_hidden(__access);
 int weak_function
 __access (const char *file, int type)
 {
   return __hurd_fail (ENOSYS);
 }
-check_no_hidden(__access_noerrno);
-int weak_function
-__access_noerrno (const char *file, int type)
-{
-  return -1;
-}
 
 int
 __rtld_execve (const char *file_name, char *const argv[],

diff --git a/sysdeps/mach/hurd/i386/localplt.data b/sysdeps/mach/hurd/i386/localplt.data
index 89b124db9f4df9f3738fde05efa495af17dc47e1..b7882d0fbd5a5e3374dda5aef4677d2839250aa2 100644 (file)
--- a/sysdeps/mach/hurd/i386/localplt.data
+++ b/sysdeps/mach/hurd/i386/localplt.data
@@ -27,7 +27,6 @@ ld.so: __mmap
 ld.so: __fstat64
 ld.so: __stat64
 ld.so: __access
-ld.so: __access_noerrno
 ld.so: __getpid
 ld.so: __getcwd
 ld.so: _exit ?

diff --git a/sysdeps/mach/hurd/not-errno.h b/sysdeps/mach/hurd/not-errno.h
deleted file mode 100644 (file)
index 956b065..0000000
--- a/sysdeps/mach/hurd/not-errno.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Syscall wrapper that do not set errno.  Generic version.
-   Copyright (C) 2017-2023 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <https://www.gnu.org/licenses/>.  */
-
-/* The __access_noerrno stub mustn't be hidden in ld.so on Hurd since it needs
-   to be preempted by __access_noerrno from libc.so after bootstrap.  */
-extern __typeof (__access) __access_noerrno;

diff --git a/sysdeps/mach/hurd/x86_64/localplt.data b/sysdeps/mach/hurd/x86_64/localplt.data
index c38821e2faf5badbbd3d616e9ba05c9fd1f46377..b7689b5cb02cf5290ed8f9d4ef77e494db057c79 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/localplt.data
+++ b/sysdeps/mach/hurd/x86_64/localplt.data
@@ -26,7 +26,6 @@ ld.so: __mmap
 ld.so: __fstat64
 ld.so: __stat64
 ld.so: __access
-ld.so: __access_noerrno
 ld.so: __getpid
 ld.so: __getcwd
 ld.so: _exit ?

diff --git a/sysdeps/unix/sysv/linux/not-errno.h b/sysdeps/unix/sysv/linux/not-errno.h
index 9100bde124a81ab1976308e5d452054efc7c53f0..e55a7c46989629204e4ca963d071a0e211aa1bab 100644 (file)
--- a/sysdeps/unix/sysv/linux/not-errno.h
+++ b/sysdeps/unix/sysv/linux/not-errno.h
@@ -19,23 +19,6 @@
 #include <sysdep.h>
 #include <fcntl.h>
 
-/* This function is used on maybe_enable_malloc_check (elf/dl-tunables.c)
-   and to avoid having to build/use multiple versions if stack protection
-   in enabled it is defined as inline.  */
-static inline int
-__access_noerrno (const char *pathname, int mode)
-{
-  int res;
-#ifdef __NR_access
-  res = INTERNAL_SYSCALL_CALL (access, pathname, mode);
-#else
-  res = INTERNAL_SYSCALL_CALL (faccessat, AT_FDCWD, pathname, mode);
-#endif
-  if (INTERNAL_SYSCALL_ERROR_P (res))
-    return INTERNAL_SYSCALL_ERRNO (res);
-  return 0;
-}
-
 static inline int
 __kill_noerrno (pid_t pid, int sig)
 {