diff options
author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-07-17 18:11:12 -0300 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-07-24 11:21:07 -0300 |
commit | 95a73392580761abc62fc9b1386d232cd55878e9 (patch) | |
tree | f629663406a340aef2846a86c3ddd738383a9af5 /sysdeps | |
parent | 422ff87c249ddc06701d096421db63343e4754be (diff) | |
download | glibc-95a73392580761abc62fc9b1386d232cd55878e9.zip glibc-95a73392580761abc62fc9b1386d232cd55878e9.tar.gz glibc-95a73392580761abc62fc9b1386d232cd55878e9.tar.bz2 |
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')
-rw-r--r-- | sysdeps/generic/not-errno.h | 19 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/access.c | 15 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/not-errno.h | 35 |
3 files changed, 54 insertions, 15 deletions
diff --git a/sysdeps/generic/not-errno.h b/sysdeps/generic/not-errno.h new file mode 100644 index 0000000..2aac095 --- /dev/null +++ b/sysdeps/generic/not-errno.h @@ -0,0 +1,19 @@ +/* Syscall wrapper that do not set errno. Generic version. + Copyright (C) 2017 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 + <http://www.gnu.org/licenses/>. */ + +extern __typeof (__access) __access_noerrno attribute_hidden; diff --git a/sysdeps/unix/sysv/linux/access.c b/sysdeps/unix/sysv/linux/access.c index 67e69bd..366b6b6 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 diff --git a/sysdeps/unix/sysv/linux/not-errno.h b/sysdeps/unix/sysv/linux/not-errno.h new file mode 100644 index 0000000..65f93f3 --- /dev/null +++ b/sysdeps/unix/sysv/linux/not-errno.h @@ -0,0 +1,35 @@ +/* Syscall wrapper that do not set errno. Linux version. + Copyright (C) 2017 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 + <http://www.gnu.org/licenses/>. */ + +/* 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; + INTERNAL_SYSCALL_DECL (err); +#ifdef __NR_access + res = INTERNAL_SYSCALL_CALL (access, err, pathname, mode); +#else + res = INTERNAL_SYSCALL_CALL (faccessat, err, AT_FDCWD, pathname, mode); +#endif + if (INTERNAL_SYSCALL_ERROR_P (res, err)) + return INTERNAL_SYSCALL_ERRNO (res, err); + return 0; +} |