about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/access.c
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2017-07-17 18:11:12 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2017-07-24 11:21:07 -0300
commit95a73392580761abc62fc9b1386d232cd55878e9 (patch)
treef629663406a340aef2846a86c3ddd738383a9af5 /sysdeps/unix/sysv/linux/access.c
parent422ff87c249ddc06701d096421db63343e4754be (diff)
downloadglibc-95a73392580761abc62fc9b1386d232cd55878e9.tar.gz
glibc-95a73392580761abc62fc9b1386d232cd55878e9.tar.xz
glibc-95a73392580761abc62fc9b1386d232cd55878e9.zip
tunables: Use direct syscall for access (BZ#21744)
The function maybe_enable_malloc_check, which is called by
__tunables_init, calls __access_noerrno.  It isn't problem when
symbol is is in ld.so, which has a special version of __access_noerrno
without stack protector.  But when glibc is built with stack protector,
maybe_enable_malloc_check in libc.a can't call the regular version of
__access_noerrno with stack protector.

This patch changes how Linux defines the __access_noerrno to be an
inline call instead and thus preventing defining different build
rules for ld/static and shared.

	H.J. Lu  <hongjiu.lu@intel.com>
	Adhemerval Zanella  <adhemerval.zanella@linaro.org>

	[BZ #21744]
	* elf/dl-tunables.c: Include not-errno.h header.
	* include/unistd.h (__access_noerrno): Remove definition.
	* sysdeps/unix/sysv/linux/access.c (__access_noerrno): Likewise.
	* sysdeps/generic/not-errno.h: New file.
	* sysdeps/unix/sysv/linux/not-errno.h: Likewise.
Diffstat (limited to 'sysdeps/unix/sysv/linux/access.c')
-rw-r--r--sysdeps/unix/sysv/linux/access.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/sysdeps/unix/sysv/linux/access.c b/sysdeps/unix/sysv/linux/access.c
index 67e69bd163..366b6b6461 100644
--- a/sysdeps/unix/sysv/linux/access.c
+++ b/sysdeps/unix/sysv/linux/access.c
@@ -21,21 +21,6 @@
 #include <sysdep-cancel.h>
 
 int
-__access_noerrno (const char *file, int type)
-{
-  int res;
-  INTERNAL_SYSCALL_DECL (err);
-#ifdef __NR_access
-  res = INTERNAL_SYSCALL_CALL (access, err, file, type);
-#else
-  res = INTERNAL_SYSCALL_CALL (faccessat, err, AT_FDCWD, file, type);
-#endif
-  if (INTERNAL_SYSCALL_ERROR_P (res, err))
-    return INTERNAL_SYSCALL_ERRNO (res, err);
-  return 0;
-}
-
-int
 __access (const char *file, int type)
 {
 #ifdef __NR_access