diff options
author | Ulrich Drepper <drepper@redhat.com> | 2003-04-19 16:57:17 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2003-04-19 16:57:17 +0000 |
commit | 2c008571c3ad156479307b7e23185ae566b5776a (patch) | |
tree | f3bad7f0e95a6d172e6577b7e2d557602e1f446c /sysdeps/generic/check_fds.c | |
parent | 76a67697c890d292d9f32e88cf24f8a3f74e47b9 (diff) | |
download | glibc-2c008571c3ad156479307b7e23185ae566b5776a.tar glibc-2c008571c3ad156479307b7e23185ae566b5776a.tar.gz glibc-2c008571c3ad156479307b7e23185ae566b5776a.tar.bz2 glibc-2c008571c3ad156479307b7e23185ae566b5776a.zip |
Update.
2003-04-19 Ulrich Drepper <drepper@redhat.com>
* catgets/nl_types.h: Remove __THROW marker from cancellation points.
* dirent/dirent.h: Likewise.
* dlfcn/dlfcn.h: Likewise.
* grp/grp.h: Likewise.
* iconv/iconv.h: Likewise.
* io/fcntl.h: Likewise.
* io/ftw.h: Likewise.
* libio/stdio.h: Likewise.
* misc/sys/mman.h: Likewise.
* misc/sys/select.h: Likewise.
* misc/sys/syslog.h: Likewise.
* misc/sys/uio.h: Likewise.
* posix/spawn.h: Likewise.
* posix/unistd.h: Likewise.
* posix/sys/wait.h: Likewise.
* pwd/pwd.h: Likewise.
* resolv/netdb.h: Likewise.
* rt/aio.h: Likewise.
* shadow/shadow.h: Likewise.
* signal/signal.h: Likewise.
* socket/sys/socket.h: Likewise.
* stdlib/stdlib.h: Likewise.
* streams/stropts.h: Likewise.
* string/string.h: Likewise.
* sysdeps/gnu/utmpx.h: Likewise.
* sysvipc/sys/msg.h: Likewise.
* termios/termios.h: Likewise.
* time/time.h: Likewise.
* wcsmbs/wchar.h: Likewise.
* iconv/gconv_cache.c: Include <not-cancel.h> and use non-cancelable
functions.
* misc/daemon.c: Likewise.
* sysdeps/generic/backtracesymsfd.c: Likewise.
* sysdeps/generic/check_fds.c: Likewise.
* sysdeps/unix/sysv/linux/gethostid.c: Likewise.
* sysdeps/unix/sysv/linux/not-cancel.h: New file.
* sysdeps/generic/not-cancel.h: New file.
* csu/Makefile (distribute): Add not-cancel.h.
* sysdeps/unix/sysv/linux/fatal-prepare.h: New file.
* sysdeps/unix/sysv/linux/Makefile: Define FATAL_PREPARE_INCLUDE
for assert.c and assert-perr.c to include <fatal-prepare.h>.
* sysdeps/unix/sysv/linux/Dist: Add fatal-prepare.h.
* sysdeps/posix/remove.c (remove): Rewrite. No need to restore
errno and unlink first.
* io/ftw.c (ftw_dir): In all places assume fchdir is available.
2003-04-18 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/libc_fatal.c (__libc_fatal): Use
INTERNAL_SYSCALL instead of INLINE_SYSCALL.
Diffstat (limited to 'sysdeps/generic/check_fds.c')
-rw-r--r-- | sysdeps/generic/check_fds.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sysdeps/generic/check_fds.c b/sysdeps/generic/check_fds.c index ff9562de08..8a3efd1b37 100644 --- a/sysdeps/generic/check_fds.c +++ b/sysdeps/generic/check_fds.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2002 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2002, 2003 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 @@ -32,6 +32,7 @@ #endif #include <device-nrs.h> +#include <not-cancel.h> /* Should other OSes (e.g., Hurd) have different versions which can @@ -39,6 +40,7 @@ static void check_one_fd (int fd, int mode) { + /* Note that fcntl() with this parameter is not a cancellation point. */ if (__builtin_expect (__libc_fcntl (fd, F_GETFD), 0) == -1 && errno == EBADF) { @@ -47,7 +49,7 @@ check_one_fd (int fd, int mode) /* Something is wrong with this descriptor, it's probably not opened. Open /dev/null so that the SUID program we are about to start does not accidently use this descriptor. */ - int nullfd = __libc_open (_PATH_DEVNULL, mode); + int nullfd = open_not_cancel (_PATH_DEVNULL, mode); /* We are very paranoid here. With all means we try to ensure that we are actually opening the /dev/null device and nothing else. |