mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-29 05:51:10 +00:00
329ea513b4
Neither the <dlfcn.h> entry points, nor lazy symbol resolution, nor initial shared library load-up, are cancellation points, so ld.so should exclusively use I/O primitives that are not cancellable. We currently achieve this by having the cancellation hooks compile as no-ops when IS_IN(rtld); this patch changes to using exclusively _nocancel primitives in the source code instead, which makes the intent clearer and significantly reduces the amount of code compiled under IS_IN(rtld) as well as IS_IN(libc) -- in particular, elf/Makefile no longer thinks we require a copy of unwind.c in rtld-libc.a. (The older mechanism is preserved as a backstop.) The bulk of the change is splitting up the files that define the _nocancel I/O functions, so they don't also define the variants that *are* cancellation points; after which, the existing logic for picking out the bits of libc that need to be recompiled as part of ld.so Just Works. I did this for all of the _nocancel functions, not just the ones used by ld.so, for consistency. fcntl was a little tricky because it's only a cancellation point for certain opcodes (F_SETLKW(64), which can block), and the existing __fcntl_nocancel wasn't applying the FCNTL_ADJUST_CMD hook, which strikes me as asking for trouble, especially as the only nontrivial definition of FCNTL_ADJUST_CMD (for powerpc64) changes F_*LK* opcodes. To fix this, fcntl_common moves to fcntl_nocancel.c along with __fcntl_nocancel, and changes its name to the extern (but hidden) symbol __fcntl_nocancel_adjusted, so that regular fcntl can continue calling it. __fcntl_nocancel now applies FCNTL_ADJUST_CMD; so that both both fcntl.c and fcntl_nocancel.c can see it, the only nontrivial definition moves from sysdeps/u/s/l/powerpc/powerpc64/fcntl.c to .../powerpc64/sysdep.h and becomes entirely a macro, instead of a macro that calls an inline function. The nptl version of libpthread also changes a little, because its "compat-routines" formerly included files that defined all the _nocancel functions it uses; instead of continuing to duplicate them, I exported the relevant ones from libc.so as GLIBC_PRIVATE. Since the Linux fcntl.c calls a function defined by fcntl_nocancel.c, it can no longer be used from libpthread.so; instead, introduce a custom forwarder, pt-fcntl.c, and export __libc_fcntl from libc.so as GLIBC_PRIVATE. The nios2-linux ABI doesn't include a copy of vfork() in libpthread, and it was handling that by manipulating libpthread-routines in .../linux/nios2/Makefile; it is cleaner to do what other such ports do, and have a pt-vfork.S that defines no symbols. Right now, it appears that Hurd does not implement _nocancel I/O, so sysdeps/generic/not-cancel.h will forward everything back to the regular functions. This changed the names of some of the functions that sysdeps/mach/hurd/dl-sysdep.c needs to interpose. * elf/dl-load.c, elf/dl-misc.c, elf/dl-profile.c, elf/rtld.c * sysdeps/unix/sysv/linux/dl-sysdep.c Include not-cancel.h. Use __close_nocancel instead of __close, __open64_nocancel instead of __open, __read_nocancel instead of __libc_read, and __write_nocancel instead of __libc_write. * csu/check_fds.c (check_one_fd) * sysdeps/posix/fdopendir.c (__fdopendir) * sysdeps/posix/opendir.c (__alloc_dir): Use __fcntl_nocancel instead of __fcntl and/or __libc_fcntl. * sysdeps/unix/sysv/linux/pthread_setname.c (pthread_setname_np) * sysdeps/unix/sysv/linux/pthread_getname.c (pthread_getname_np) * sysdeps/unix/sysv/linux/i386/smp.h (is_smp_system): Use __open64_nocancel instead of __open_nocancel. * sysdeps/unix/sysv/linux/not-cancel.h: Move all of the hidden_proto declarations to the end and issue them if either IS_IN(libc) or IS_IN(rtld). * sysdeps/unix/sysv/linux/Makefile [subdir=io] (sysdep_routines): Add close_nocancel, fcntl_nocancel, nanosleep_nocancel, open_nocancel, open64_nocancel, openat_nocancel, pause_nocancel, read_nocancel, waitpid_nocancel, write_nocancel. * io/Versions [GLIBC_PRIVATE]: Add __libc_fcntl, __fcntl_nocancel, __open64_nocancel, __write_nocancel. * posix/Versions: Add __nanosleep_nocancel, __pause_nocancel. * nptl/pt-fcntl.c: New file. * nptl/Makefile (pthread-compat-wrappers): Remove fcntl. (libpthread-routines): Add pt-fcntl. * include/fcntl.h (__fcntl_nocancel_adjusted): New function. (__libc_fcntl): Remove attribute_hidden. * sysdeps/unix/sysv/linux/fcntl.c (__libc_fcntl): Call __fcntl_nocancel_adjusted, not fcntl_common. (__fcntl_nocancel): Move to new file fcntl_nocancel.c. (fcntl_common): Rename to __fcntl_nocancel_adjusted; also move to fcntl_nocancel.c. * sysdeps/unix/sysv/linux/fcntl_nocancel.c: New file. * sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c: Remove file. * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h: Define FCNTL_ADJUST_CMD here, as a self-contained macro. * sysdeps/unix/sysv/linux/close.c: Move __close_nocancel to... * sysdeps/unix/sysv/linux/close_nocancel.c: ...this new file. * sysdeps/unix/sysv/linux/nanosleep.c: Move __nanosleep_nocancel to... * sysdeps/unix/sysv/linux/nanosleep_nocancel.c: ...this new file. * sysdeps/unix/sysv/linux/open.c: Move __open_nocancel to... * sysdeps/unix/sysv/linux/open_nocancel.c: ...this new file. * sysdeps/unix/sysv/linux/open64.c: Move __open64_nocancel to... * sysdeps/unix/sysv/linux/open64_nocancel.c: ...this new file. * sysdeps/unix/sysv/linux/openat.c: Move __openat_nocancel to... * sysdeps/unix/sysv/linux/openat_nocancel.c: ...this new file. * sysdeps/unix/sysv/linux/openat64.c: Move __openat64_nocancel to... * sysdeps/unix/sysv/linux/openat64_nocancel.c: ...this new file. * sysdeps/unix/sysv/linux/pause.c: Move __pause_nocancel to... * sysdeps/unix/sysv/linux/pause_nocancel.c: ...this new file. * sysdeps/unix/sysv/linux/read.c: Move __read_nocancel to... * sysdeps/unix/sysv/linux/read_nocancel.c: ...this new file. * sysdeps/unix/sysv/linux/waitpid.c: Move __waitpid_nocancel to... * sysdeps/unix/sysv/linux/waitpid_nocancel.c: ...this new file. * sysdeps/unix/sysv/linux/write.c: Move __write_nocancel to... * sysdeps/unix/sysv/linux/write_nocancel.c: ...this new file. * sysdeps/unix/sysv/linux/nios2/Makefile: Don't override libpthread-routines. * sysdeps/unix/sysv/linux/nios2/pt-vfork.S: New file which defines nothing. * sysdeps/mach/hurd/dl-sysdep.c: Define __read instead of __libc_read, and __write instead of __libc_write. Define __open64 in addition to __open.
149 lines
4.0 KiB
C
149 lines
4.0 KiB
C
/* Copyright (C) 1991-2018 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/>. */
|
|
|
|
#include <dirent.h>
|
|
#include <fcntl.h>
|
|
#include <errno.h>
|
|
#include <stdio.h> /* For BUFSIZ. */
|
|
#include <sys/param.h> /* For MIN and MAX. */
|
|
|
|
#include <not-cancel.h>
|
|
|
|
/* The st_blksize value of the directory is used as a hint for the
|
|
size of the buffer which receives struct dirent values from the
|
|
kernel. st_blksize is limited to MAX_DIR_BUFFER_SIZE, in case the
|
|
file system provides a bogus value. */
|
|
#define MAX_DIR_BUFFER_SIZE 1048576U
|
|
|
|
enum {
|
|
opendir_oflags = O_RDONLY|O_NDELAY|O_DIRECTORY|O_LARGEFILE|O_CLOEXEC
|
|
};
|
|
|
|
static bool
|
|
invalid_name (const char *name)
|
|
{
|
|
if (__glibc_unlikely (name[0] == '\0'))
|
|
{
|
|
/* POSIX.1-1990 says an empty name gets ENOENT;
|
|
but `open' might like it fine. */
|
|
__set_errno (ENOENT);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
static DIR *
|
|
opendir_tail (int fd)
|
|
{
|
|
if (__glibc_unlikely (fd < 0))
|
|
return NULL;
|
|
|
|
/* Now make sure this really is a directory and nothing changed since the
|
|
`stat' call. The S_ISDIR check is superfluous if O_DIRECTORY works,
|
|
but it's cheap and we need the stat call for st_blksize anyway. */
|
|
struct stat64 statbuf;
|
|
if (__glibc_unlikely (__fxstat64 (_STAT_VER, fd, &statbuf) < 0))
|
|
goto lose;
|
|
if (__glibc_unlikely (! S_ISDIR (statbuf.st_mode)))
|
|
{
|
|
__set_errno (ENOTDIR);
|
|
lose:
|
|
__close_nocancel_nostatus (fd);
|
|
return NULL;
|
|
}
|
|
|
|
return __alloc_dir (fd, true, 0, &statbuf);
|
|
}
|
|
|
|
|
|
#if IS_IN (libc)
|
|
DIR *
|
|
__opendirat (int dfd, const char *name)
|
|
{
|
|
if (__glibc_unlikely (invalid_name (name)))
|
|
return NULL;
|
|
|
|
return opendir_tail (__openat_nocancel (dfd, name, opendir_oflags));
|
|
}
|
|
#endif
|
|
|
|
|
|
/* Open a directory stream on NAME. */
|
|
DIR *
|
|
__opendir (const char *name)
|
|
{
|
|
if (__glibc_unlikely (invalid_name (name)))
|
|
return NULL;
|
|
|
|
return opendir_tail (__open_nocancel (name, opendir_oflags));
|
|
}
|
|
weak_alias (__opendir, opendir)
|
|
|
|
DIR *
|
|
__alloc_dir (int fd, bool close_fd, int flags, const struct stat64 *statp)
|
|
{
|
|
/* We have to set the close-on-exit flag if the user provided the
|
|
file descriptor. */
|
|
if (!close_fd
|
|
&& __glibc_unlikely (__fcntl_nocancel (fd, F_SETFD, FD_CLOEXEC) < 0))
|
|
goto lose;
|
|
|
|
const size_t default_allocation = (4 * BUFSIZ < sizeof (struct dirent64)
|
|
? sizeof (struct dirent64) : 4 * BUFSIZ);
|
|
const size_t small_allocation = (BUFSIZ < sizeof (struct dirent64)
|
|
? sizeof (struct dirent64) : BUFSIZ);
|
|
size_t allocation = default_allocation;
|
|
#ifdef _STATBUF_ST_BLKSIZE
|
|
/* Increase allocation if requested, but not if the value appears to
|
|
be bogus. */
|
|
if (statp != NULL)
|
|
allocation = MIN (MAX ((size_t) statp->st_blksize, default_allocation),
|
|
MAX_DIR_BUFFER_SIZE);
|
|
#endif
|
|
|
|
DIR *dirp = (DIR *) malloc (sizeof (DIR) + allocation);
|
|
if (dirp == NULL)
|
|
{
|
|
allocation = small_allocation;
|
|
dirp = (DIR *) malloc (sizeof (DIR) + allocation);
|
|
|
|
if (dirp == NULL)
|
|
lose:
|
|
{
|
|
if (close_fd)
|
|
{
|
|
int save_errno = errno;
|
|
__close_nocancel_nostatus (fd);
|
|
__set_errno (save_errno);
|
|
}
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
dirp->fd = fd;
|
|
#if IS_IN (libc)
|
|
__libc_lock_init (dirp->lock);
|
|
#endif
|
|
dirp->allocation = allocation;
|
|
dirp->size = 0;
|
|
dirp->offset = 0;
|
|
dirp->filepos = 0;
|
|
dirp->errcode = 0;
|
|
|
|
return dirp;
|
|
}
|