mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-26 23:10:06 +00:00
c181840c93
This patch consolidates all the non cancellable close calls to use the __close_nocancel{_nostatus} identifier. For non cancellable targets it will be just a macro to call the default respective symbol while on Linux will be a internal one. Also, since it is used on libcrypto it is also exported in GLIBC_PRIVATE namespace. Checked on x86_64-linux-gnu, x86_64-linux-gnu-x32, and i686-linux-gnu. * sysdeps/generic/not-cancel.h (close_not_cancel): Remove macro. (close_not_cancel_no_status): Likewise. (__close_nocancel): New macro. (__close_nocancel_no_status): Likewise. * sysdeps/unix/sysv/linux/not-cancel.h (__close_nocancel): Remove macro. (close_not_cancel): Likewise. (close_not_cancel_no_status): Likewise. (__close_nocancel): New prototype. (__close_nocancel_no_status): New function. * sysdeps/unix/sysv/linux/close.c (__close_nocancel): New function. * catgets/open_catalog.c (__open_catalog): Replace close_not_cancel{_no_status) with __close_nocancel{_nostatus}. * gmon/gmon.c (write_gmon): Likewise. * iconv/gconv_cache.c (__gconv_load_cache): Likewise. * intl/loadmsgcat.c (close): Likewise. * io/ftw.c (open_dir_stream): Likewise. (ftw_startup): Likewise. * libio/fileops.c (_IO_file_open): Likewise. (_IO_file_close_mmap): Likewise. (_IO_file_close): Likewise. * libio/iopopen.c (_IO_dup2): Likewise. * locale/loadarchive.c (_nl_load_locale_from_archive): Likewise. * locale/loadlocale.c (_nl_load_locale): Likewise. * login/utmp_file.c (pututline_file): Likewise. (endutent_file): Likewise. * misc/daemon.c (daemon): Likewise. * nscd/nscd_getai.c (__nscd_getai): Likewise. * nscd/nscd_getgr_r.c (nscd_getgr_r): Likewise. * nscd/nscd_gethst_r.c (nscd_gethst_r): Likewise. * nscd/nscd_getpw_r.c (nscd_getpw_r): Likewise. * nscd/nscd_getserv_r.c (nscd_getserv_r): Likewise. * nscd/nscd_helper.c (open_socket): Likewise. (__nscd_open_socket): Likewise. * nscd/nscd_initgroups.c (__nscd_getgrouplist): Likewise. * nscd/nscd_netgroup.c (__nscd_setnetgrent): Likewise. (__nscd_innetgr): Likewise. * nss/nss_db/db-open.c (internal_setent): Likewise. * resolv/res-close.c (__res_iclose): Likewise. * sunrpc/pm_getmaps.c (pmap_getmaps): Likewise. * sysdeps/posix/closedir.c (__closedir): Likewise. * sysdeps/posix/getaddrinfo.c (getaddrinfo): Likewise. * sysdeps/posix/getcwd.c (__getcwd): Likewise. * sysdeps/posix/opendir.c (tryopen_o_directory): Likewise. (opendir_tail): Likewise. * sysdeps/posix/spawni.c (__spawni_child): Likewise. * sysdeps/unix/sysv/linux/check_native.c (__check_native): Likewise. * sysdeps/unix/sysv/linux/check_pf.c (__check_pf): Likewise. * sysdeps/unix/sysv/linux/fips-private.h (fips_enabled_p): Likewise. * sysdeps/unix/sysv/linux/gethostid.c (sethostid): Likewise. (gethostid): Likewise. * sysdeps/unix/sysv/linux/getloadavg.c (getloadavg): Likewise. * sysdeps/unix/sysv/linux/getlogin_r.c (__getlogin_r_loginuid): Likewise. * sysdeps/unix/sysv/linux/getsysstats.c (__get_nprocs): Likewise. * sysdeps/unix/sysv/linux/grantpt.c (close_all_fds): Likewise. * sysdeps/unix/sysv/linux/i386/smp.h (is_smp_system): Likewise. * sysdeps/unix/sysv/linux/ia64/has_cpuclock.c (has_cpuclock): Likewise. * sysdeps/unix/sysv/linux/if_index.c (__if_nametoindex): Likewise. * sysdeps/unix/sysv/linux/libc_fatal.c (backtrace_and_maps): Likewise. * sysdeps/unix/sysv/linux/malloc-sysdep.h (check_may_shrink_heap): Likewise. * sysdeps/unix/sysv/linux/mq_notify.c (init_mq_netlink): Likewise. * sysdeps/unix/sysv/linux/pthread_getname.c (pthread_getname_np): Likewise. * sysdeps/unix/sysv/linux/pthread_setname.c (pthread_setname_np): Likewise. * sysdeps/unix/sysv/linux/spawni.c (__spawni_child): Likewise. * sysdeps/unix/sysv/linux/sysconf.c (__sysconf): Likewise.
249 lines
6.6 KiB
C
249 lines
6.6 KiB
C
/* Copyright (C) 1991-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/>. */
|
|
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
#include <stdbool.h>
|
|
#include <stddef.h>
|
|
#include <stdlib.h>
|
|
#include <dirent.h>
|
|
#include <fcntl.h>
|
|
#include <sys/param.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <unistd.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include <dirstream.h>
|
|
#include <not-cancel.h>
|
|
#include <kernel-features.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
|
|
|
|
/* opendir() must not accidentally open something other than a directory.
|
|
Some OS's have kernel support for that, some don't. In the worst
|
|
case we have to stat() before the open() AND fstat() after.
|
|
|
|
We have to test at runtime for kernel support since libc may have
|
|
been compiled with different headers to the kernel it's running on.
|
|
This test can't be done reliably in the general case. We'll use
|
|
/dev/null, which if it's not a device lots of stuff will break, as
|
|
a guinea pig. It may be missing in chroot environments, so we
|
|
make sure to fail safe. */
|
|
#ifdef O_DIRECTORY
|
|
# ifdef O_DIRECTORY_WORKS
|
|
# define o_directory_works 1
|
|
# define tryopen_o_directory() while (1) /* This must not be called. */
|
|
# else
|
|
static int o_directory_works;
|
|
|
|
static void
|
|
tryopen_o_directory (void)
|
|
{
|
|
int serrno = errno;
|
|
int x = __open_nocancel ("/dev/null", O_RDONLY|O_NDELAY|O_DIRECTORY);
|
|
|
|
if (x >= 0)
|
|
{
|
|
__close_nocancel_nostatus (x);
|
|
o_directory_works = -1;
|
|
}
|
|
else if (errno != ENOTDIR)
|
|
o_directory_works = -1;
|
|
else
|
|
o_directory_works = 1;
|
|
|
|
__set_errno (serrno);
|
|
}
|
|
# endif
|
|
# define EXTRA_FLAGS O_DIRECTORY
|
|
#else
|
|
# define EXTRA_FLAGS 0
|
|
#endif
|
|
|
|
enum {
|
|
opendir_oflags = O_RDONLY|O_NDELAY|EXTRA_FLAGS|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 bool
|
|
need_isdir_precheck (void)
|
|
{
|
|
#ifdef O_DIRECTORY
|
|
/* Test whether O_DIRECTORY works. */
|
|
if (o_directory_works == 0)
|
|
tryopen_o_directory ();
|
|
|
|
/* We can skip the expensive `stat' call if O_DIRECTORY works. */
|
|
return o_directory_works < 0;
|
|
#endif
|
|
return true;
|
|
}
|
|
|
|
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 *
|
|
internal_function
|
|
__opendirat (int dfd, const char *name)
|
|
{
|
|
if (__glibc_unlikely (invalid_name (name)))
|
|
return NULL;
|
|
|
|
if (need_isdir_precheck ())
|
|
{
|
|
/* We first have to check whether the name is for a directory. We
|
|
cannot do this after the open() call since the open/close operation
|
|
performed on, say, a tape device might have undesirable effects. */
|
|
struct stat64 statbuf;
|
|
if (__glibc_unlikely (__fxstatat64 (_STAT_VER, dfd, name,
|
|
&statbuf, 0) < 0))
|
|
return NULL;
|
|
if (__glibc_unlikely (! S_ISDIR (statbuf.st_mode)))
|
|
{
|
|
__set_errno (ENOTDIR);
|
|
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;
|
|
|
|
if (need_isdir_precheck ())
|
|
{
|
|
/* We first have to check whether the name is for a directory. We
|
|
cannot do this after the open() call since the open/close operation
|
|
performed on, say, a tape device might have undesirable effects. */
|
|
struct stat64 statbuf;
|
|
if (__glibc_unlikely (__xstat64 (_STAT_VER, name, &statbuf) < 0))
|
|
return NULL;
|
|
if (__glibc_unlikely (! S_ISDIR (statbuf.st_mode)))
|
|
{
|
|
__set_errno (ENOTDIR);
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
return opendir_tail (__open_nocancel (name, opendir_oflags));
|
|
}
|
|
weak_alias (__opendir, opendir)
|
|
|
|
DIR *
|
|
internal_function
|
|
__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
|
|
&& __builtin_expect (__fcntl (fd, F_SETFD, FD_CLOEXEC), 0) < 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;
|
|
}
|