picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Consolidate non cancellable close call

Browse source 
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.
This commit is contained in:
Adhemerval Zanella 2017-07-03 15:22:58 -03:00
parent 0bb2fabcb3
commit c181840c93
50 changed files with 171 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
ChangeLog
View file

@ -1,5 +1,78 @@
2017-08-18 Adhemerval Zanella <adhemerval.zanella@linaro.org> 2017-08-18 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* sysdeps/generic/not-cancel.h (close_not_cancel): Remove macro.
(close_not_cancel_no_status): Likewise.
(__close_nocancel): New macro.
(__close_nocancel_nostatus): 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_nostatus): 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.
* sysdeps/unix/sysv/linux/Versions (libc) [GLIBC_PRIVATE]: Add
__close_nocancel.
* sysdeps/generic/not-cancel.h (openat_not_cancel): Remove macro. * sysdeps/generic/not-cancel.h (openat_not_cancel): Remove macro.
(openat_not_cancel_3): Likewise. (openat_not_cancel_3): Likewise.
(openat64_not_cancel_3): Likewise). (openat64_not_cancel_3): Likewise).

2
catgets/open_catalog.c
View file

@ -328,7 +328,7 @@ __open_catalog (const char *cat_name, const char *nlspath, const char *env_var,
/* Release the lock again. */ /* Release the lock again. */
close_unlock_return: close_unlock_return:
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
free (buf); free (buf);
return result; return result;

2
gmon/gmon.c
View file

@ -386,7 +386,7 @@ write_gmon (void)
/* write basic-block execution counts: */ /* write basic-block execution counts: */
write_bb_counts (fd); write_bb_counts (fd);
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
} }

4
iconv/gconv_cache.c
View file

@ -71,7 +71,7 @@ __gconv_load_cache (void)
|| (size_t) st.st_size < sizeof (struct gconvcache_header)) || (size_t) st.st_size < sizeof (struct gconvcache_header))
{ {
close_and_exit: close_and_exit:
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
return -1; return -1;
} }
@ -108,7 +108,7 @@ __gconv_load_cache (void)
} }
/* We don't need the file descriptor anymore. */ /* We don't need the file descriptor anymore. */
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
/* Check the consistency. */ /* Check the consistency. */
header = (struct gconvcache_header *) gconv_cache; header = (struct gconvcache_header *) gconv_cache;

2
intl/loadmsgcat.c
View file

@ -446,7 +446,7 @@
because some ISO C functions will require linking with this object because some ISO C functions will require linking with this object
file and the name space must not be polluted. */ file and the name space must not be polluted. */
# define open(name, flags) __open_nocancel (name, flags) # define open(name, flags) __open_nocancel (name, flags)
# define close(fd) close_not_cancel_no_status (fd) # define close(fd) __close_nocancel_nostatus (fd)
# define read(fd, buf, n) __read_nocancel (fd, buf, n) # define read(fd, buf, n) __read_nocancel (fd, buf, n)
# define mmap(addr, len, prot, flags, fd, offset) \ # define mmap(addr, len, prot, flags, fd, offset) \
__mmap (addr, len, prot, flags, fd, offset) __mmap (addr, len, prot, flags, fd, offset)

4
io/ftw.c
View file

@ -341,7 +341,7 @@ open_dir_stream (int *dfdp, struct ftw_data *data, struct dir_data *dirp)
O_RDONLY | O_DIRECTORY | O_NDELAY); O_RDONLY | O_DIRECTORY | O_NDELAY);
dirp->stream = NULL; dirp->stream = NULL;
if (fd != -1 && (dirp->stream = __fdopendir (fd)) == NULL) if (fd != -1 && (dirp->stream = __fdopendir (fd)) == NULL)
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
} }
else else
{ {
@ -791,7 +791,7 @@ ftw_startup (const char *dir, int is_nftw, void *func, int descriptors,
{ {
int save_err = errno; int save_err = errno;
__fchdir (cwdfd); __fchdir (cwdfd);
close_not_cancel_no_status (cwdfd); __close_nocancel_nostatus (cwdfd);
__set_errno (save_err); __set_errno (save_err);
} }
else if (cwd != NULL) else if (cwd != NULL)

6
libio/fileops.c
View file

@ -242,7 +242,7 @@ _IO_file_open (_IO_FILE *fp, const char *filename, int posix_mode, int prot,
_IO_off64_t new_pos = _IO_SYSSEEK (fp, 0, _IO_seek_end); _IO_off64_t new_pos = _IO_SYSSEEK (fp, 0, _IO_seek_end);
if (new_pos == _IO_pos_BAD && errno != ESPIPE) if (new_pos == _IO_pos_BAD && errno != ESPIPE)
{ {
close_not_cancel (fdesc); __close_nocancel (fdesc);
return NULL; return NULL;
} }
} }
@ -1231,7 +1231,7 @@ _IO_file_close_mmap (_IO_FILE *fp)
fp->_IO_buf_base = fp->_IO_buf_end = NULL; fp->_IO_buf_base = fp->_IO_buf_end = NULL;
/* Cancelling close should be avoided if possible since it leaves an /* Cancelling close should be avoided if possible since it leaves an
unrecoverable state behind. */ unrecoverable state behind. */
return close_not_cancel (fp->_fileno); return __close_nocancel (fp->_fileno);
} }
int int
@ -1239,7 +1239,7 @@ _IO_file_close (_IO_FILE *fp)
{ {
/* Cancelling close should be avoided if possible since it leaves an /* Cancelling close should be avoided if possible since it leaves an
unrecoverable state behind. */ unrecoverable state behind. */
return close_not_cancel (fp->_fileno); return __close_nocancel (fp->_fileno);
} }
libc_hidden_def (_IO_file_close) libc_hidden_def (_IO_file_close)

2
libio/iopopen.c
View file

@ -76,7 +76,7 @@ extern int _IO_dup2 (int fd, int fd2) __THROW;
#ifndef _IO_close #ifndef _IO_close
#ifdef _LIBC #ifdef _LIBC
#define _IO_close close_not_cancel #define _IO_close __close_nocancel
#else #else
#define _IO_close close #define _IO_close close
#endif #endif

6
locale/loadarchive.c
View file

@ -213,7 +213,7 @@ _nl_load_locale_from_archive (int category, const char **namep)
/* stat failed, very strange. */ /* stat failed, very strange. */
close_and_out: close_and_out:
if (fd >= 0) if (fd >= 0)
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
return NULL; return NULL;
} }
@ -253,7 +253,7 @@ _nl_load_locale_from_archive (int category, const char **namep)
{ {
/* We've mapped the whole file already, so we can be /* We've mapped the whole file already, so we can be
sure we won't need this file descriptor later. */ sure we won't need this file descriptor later. */
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
fd = -1; fd = -1;
} }
@ -452,7 +452,7 @@ _nl_load_locale_from_archive (int category, const char **namep)
/* We don't need the file descriptor any longer. */ /* We don't need the file descriptor any longer. */
if (fd >= 0) if (fd >= 0)
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
fd = -1; fd = -1;
/* We succeeded in mapping all the necessary regions of the archive. /* We succeeded in mapping all the necessary regions of the archive.

6
locale/loadlocale.c
View file

@ -181,7 +181,7 @@ _nl_load_locale (struct loaded_l10nfile *file, int category)
if (__builtin_expect (__fxstat64 (_STAT_VER, fd, &st), 0) < 0) if (__builtin_expect (__fxstat64 (_STAT_VER, fd, &st), 0) < 0)
{ {
puntfd: puntfd:
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
return; return;
} }
if (__glibc_unlikely (S_ISDIR (st.st_mode))) if (__glibc_unlikely (S_ISDIR (st.st_mode)))
@ -191,7 +191,7 @@ _nl_load_locale (struct loaded_l10nfile *file, int category)
char *newp; char *newp;
size_t filenamelen; size_t filenamelen;
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
filenamelen = strlen (file->filename); filenamelen = strlen (file->filename);
newp = (char *) alloca (filenamelen newp = (char *) alloca (filenamelen
@ -257,7 +257,7 @@ _nl_load_locale (struct loaded_l10nfile *file, int category)
#endif /* _POSIX_MAPPED_FILES */ #endif /* _POSIX_MAPPED_FILES */
/* We have mapped the data, so we no longer need the descriptor. */ /* We have mapped the data, so we no longer need the descriptor. */
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
if (__glibc_unlikely (filedata == NULL)) if (__glibc_unlikely (filedata == NULL))
/* We failed to map or read the data. */ /* We failed to map or read the data. */

8
login/utmp_file.c
View file

@ -382,10 +382,10 @@ pututline_file (const struct utmp *data)
if (__lseek64 (new_fd, __lseek64 (file_fd, 0, SEEK_CUR), SEEK_SET) == -1 if (__lseek64 (new_fd, __lseek64 (file_fd, 0, SEEK_CUR), SEEK_SET) == -1
|| __dup2 (new_fd, file_fd) < 0) || __dup2 (new_fd, file_fd) < 0)
{ {
close_not_cancel_no_status (new_fd); __close_nocancel_nostatus (new_fd);
return NULL; return NULL;
} }
close_not_cancel_no_status (new_fd); __close_nocancel_nostatus (new_fd);
file_writable = true; file_writable = true;
} }
@ -471,7 +471,7 @@ endutent_file (void)
{ {
assert (file_fd >= 0); assert (file_fd >= 0);
close_not_cancel_no_status (file_fd); __close_nocancel_nostatus (file_fd);
file_fd = -1; file_fd = -1;
} }
@ -518,7 +518,7 @@ unlock_return:
UNLOCK_FILE (fd); UNLOCK_FILE (fd);
/* Close WTMP file. */ /* Close WTMP file. */
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
return result; return result;
} }

4
misc/daemon.c
View file

@ -80,12 +80,12 @@ daemon (int nochdir, int noclose)
} else { } else {
/* We must set an errno value since no /* We must set an errno value since no
function call actually failed. */ function call actually failed. */
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
__set_errno (ENODEV); __set_errno (ENODEV);
return -1; return -1;
} }
} else { } else {
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
return -1; return -1;
} }
} }

2
nscd/nscd_getai.c
View file

@ -189,7 +189,7 @@ __nscd_getai (const char *key, struct nscd_ai_result **result, int *h_errnop)
out_close: out_close:
if (sock != -1) if (sock != -1)
close_not_cancel_no_status (sock); __close_nocancel_nostatus (sock);
out: out:
if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0) if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0)
{ {

2
nscd/nscd_getgr_r.c
View file

@ -305,7 +305,7 @@ nscd_getgr_r (const char *key, size_t keylen, request_type type,
out_close: out_close:
if (sock != -1) if (sock != -1)
close_not_cancel_no_status (sock); __close_nocancel_nostatus (sock);
out: out:
if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0) if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0)
{ {

2
nscd/nscd_gethst_r.c
View file

@ -436,7 +436,7 @@ nscd_gethst_r (const char *key, size_t keylen, request_type type,
out_close: out_close:
if (sock != -1) if (sock != -1)
close_not_cancel_no_status (sock); __close_nocancel_nostatus (sock);
out: out:
if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0) if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0)
{ {

2
nscd/nscd_getpw_r.c
View file

@ -218,7 +218,7 @@ nscd_getpw_r (const char *key, size_t keylen, request_type type,
out_close: out_close:
if (sock != -1) if (sock != -1)
close_not_cancel_no_status (sock); __close_nocancel_nostatus (sock);
out: out:
if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0) if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0)
{ {

2
nscd/nscd_getserv_r.c
View file

@ -356,7 +356,7 @@ nscd_getserv_r (const char *crit, size_t critlen, const char *proto,
out_close: out_close:
if (sock != -1) if (sock != -1)
close_not_cancel_no_status (sock); __close_nocancel_nostatus (sock);
out: out:
if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0) if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0)
{ {

4
nscd/nscd_helper.c
View file

@ -236,7 +236,7 @@ open_socket (request_type type, const char *key, size_t keylen)
} }
out: out:
close_not_cancel_no_status (sock); __close_nocancel_nostatus (sock);
return -1; return -1;
} }
@ -555,7 +555,7 @@ __nscd_open_socket (const char *key, size_t keylen, request_type type,
return sock; return sock;
} }
close_not_cancel_no_status (sock); __close_nocancel_nostatus (sock);
} }
__set_errno (saved_errno); __set_errno (saved_errno);

2
nscd/nscd_initgroups.c
View file

@ -157,7 +157,7 @@ __nscd_getgrouplist (const char *user, gid_t group, long int *size,
out_close: out_close:
if (sock != -1) if (sock != -1)
close_not_cancel_no_status (sock); __close_nocancel_nostatus (sock);
out: out:
if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0) if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0)
{ {

4
nscd/nscd_netgroup.c
View file

@ -139,7 +139,7 @@ __nscd_setnetgrent (const char *group, struct __netgrent *datap)
out_close: out_close:
if (sock != -1) if (sock != -1)
close_not_cancel_no_status (sock); __close_nocancel_nostatus (sock);
out: out:
if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0) if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0)
{ {
@ -263,7 +263,7 @@ __nscd_innetgr (const char *netgroup, const char *host, const char *user,
out_close: out_close:
if (sock != -1) if (sock != -1)
close_not_cancel_no_status (sock); __close_nocancel_nostatus (sock);
out: out:
if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0) if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0)
{ {

2
nss/nss_db/db-open.c
View file

@ -52,7 +52,7 @@ internal_setent (const char *file, struct nss_db_map *mapping)
status = NSS_STATUS_TRYAGAIN; status = NSS_STATUS_TRYAGAIN;
} }
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
} }
return status; return status;

4
resolv/res-close.c
View file

@ -94,7 +94,7 @@ __res_iclose (res_state statp, bool free_addr)
{ {
if (statp->_vcsock >= 0) if (statp->_vcsock >= 0)
{ {
close_not_cancel_no_status (statp->_vcsock); __close_nocancel_nostatus (statp->_vcsock);
statp->_vcsock = -1; statp->_vcsock = -1;
statp->_flags &= ~(RES_F_VC | RES_F_CONN); statp->_flags &= ~(RES_F_VC | RES_F_CONN);
} }
@ -103,7 +103,7 @@ __res_iclose (res_state statp, bool free_addr)
{ {
if (statp->_u._ext.nssocks[ns] != -1) if (statp->_u._ext.nssocks[ns] != -1)
{ {
close_not_cancel_no_status (statp->_u._ext.nssocks[ns]); __close_nocancel_nostatus (statp->_u._ext.nssocks[ns]);
statp->_u._ext.nssocks[ns] = -1; statp->_u._ext.nssocks[ns] = -1;
} }
if (free_addr) if (free_addr)

2
sunrpc/pm_getmaps.c
View file

@ -81,7 +81,7 @@ pmap_getmaps (struct sockaddr_in *address)
} }
/* We only need to close the socket here if we opened it. */ /* We only need to close the socket here if we opened it. */
if (closeit) if (closeit)
close_not_cancel (socket); __close_nocancel (socket);
address->sin_port = 0; address->sin_port = 0;
return head; return head;
} }

4
sysdeps/generic/not-cancel.h
View file

@ -26,9 +26,9 @@
__openat (__VA_ARGS__) __openat (__VA_ARGS__)
#define __openat64_nocancel(...) \ #define __openat64_nocancel(...) \
__openat64 (__VA_ARGS__) __openat64 (__VA_ARGS__)
#define close_not_cancel(fd) \ #define __close_nocancel(fd) \
__close (fd) __close (fd)
#define close_not_cancel_no_status(fd) \ #define __close_nocancel_nostatus(fd) \
(void) __close (fd) (void) __close (fd)
#define __read_nocancel(fd, buf, n) \ #define __read_nocancel(fd, buf, n) \
__read (fd, buf, n) __read (fd, buf, n)

2
sysdeps/posix/closedir.c
View file

@ -49,6 +49,6 @@ __closedir (DIR *dirp)
free ((void *) dirp); free ((void *) dirp);
return close_not_cancel (fd); return __close_nocancel (fd);
} }
weak_alias (__closedir, closedir) weak_alias (__closedir, closedir)

4
sysdeps/posix/getaddrinfo.c
View file

@ -2399,7 +2399,7 @@ getaddrinfo (const char *name, const char *service,
{ {
if (fd != -1) if (fd != -1)
close_retry: close_retry:
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
af = q->ai_family; af = q->ai_family;
fd = __socket (af, SOCK_DGRAM | SOCK_CLOEXEC, IPPROTO_IP); fd = __socket (af, SOCK_DGRAM | SOCK_CLOEXEC, IPPROTO_IP);
} }
@ -2502,7 +2502,7 @@ getaddrinfo (const char *name, const char *service,
} }
if (fd != -1) if (fd != -1)
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
/* We got all the source addresses we can get, now sort using /* We got all the source addresses we can get, now sort using
the information. */ the information. */

4
sysdeps/posix/getcwd.c
View file

@ -176,7 +176,7 @@ extern char *alloca ();
# include <kernel-features.h> # include <kernel-features.h>
#else #else
# define __openat64_nocancel(dfd, name, mode) openat64 (dfd, name, mode) # define __openat64_nocancel(dfd, name, mode) openat64 (dfd, name, mode)
# define close_not_cancel_no_status(fd) close (fd) # define __close_nocancel_nostatus(fd) close (fd)
#endif #endif
#ifndef PATH_MAX #ifndef PATH_MAX
@ -521,7 +521,7 @@ __getcwd (char *buf, size_t size)
if (dirstream != NULL) if (dirstream != NULL)
__closedir (dirstream); __closedir (dirstream);
if (fd_needs_closing) if (fd_needs_closing)
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
#ifndef NO_ALLOCATION #ifndef NO_ALLOCATION
if (buf == NULL) if (buf == NULL)
free (path); free (path);

6
sysdeps/posix/opendir.c
View file

@ -65,7 +65,7 @@ tryopen_o_directory (void)
if (x >= 0) if (x >= 0)
{ {
close_not_cancel_no_status (x); __close_nocancel_nostatus (x);
o_directory_works = -1; o_directory_works = -1;
} }
else if (errno != ENOTDIR) else if (errno != ENOTDIR)
@ -129,7 +129,7 @@ opendir_tail (int fd)
{ {
__set_errno (ENOTDIR); __set_errno (ENOTDIR);
lose: lose:
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
return NULL; return NULL;
} }
@ -227,7 +227,7 @@ __alloc_dir (int fd, bool close_fd, int flags, const struct stat64 *statp)
if (close_fd) if (close_fd)
{ {
int save_errno = errno; int save_errno = errno;
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
__set_errno (save_errno); __set_errno (save_errno);
} }
return NULL; return NULL;

6
sysdeps/posix/spawni.c
View file

@ -157,7 +157,7 @@ __spawni_child (void *arguments)
switch (action->tag) switch (action->tag)
{ {
case spawn_do_close: case spawn_do_close:
if (close_not_cancel (action->action.close_action.fd) != 0) if (__close_nocancel (action->action.close_action.fd) != 0)
{ {
if (have_fdlimit == 0) if (have_fdlimit == 0)
{ {
@ -180,7 +180,7 @@ __spawni_child (void *arguments)
with the process already at maximum number of file descriptor with the process already at maximum number of file descriptor
opened and also for multiple actions on single-open special opened and also for multiple actions on single-open special
paths (like /dev/watchdog). */ paths (like /dev/watchdog). */
close_not_cancel (action->action.open_action.fd); __close_nocancel (action->action.open_action.fd);
int new_fd = __open_nocancel (action->action.open_action.path, int new_fd = __open_nocancel (action->action.open_action.path,
action->action.open_action.oflag action->action.open_action.oflag
@ -197,7 +197,7 @@ __spawni_child (void *arguments)
!= action->action.open_action.fd) != action->action.open_action.fd)
goto fail; goto fail;
if (close_not_cancel (new_fd) != 0) if (__close_nocancel (new_fd) != 0)
goto fail; goto fail;
} }
} }

1
sysdeps/unix/sysv/linux/Versions
View file

@ -171,6 +171,7 @@ libc {
__syscall_rt_sigqueueinfo; __syscall_rt_sigqueueinfo;
__open_nocancel; __open_nocancel;
__read_nocancel; __read_nocancel;
__close_nocancel;
# functions used by nscd # functions used by nscd
__netlink_assert_response; __netlink_assert_response;
} }

2
sysdeps/unix/sysv/linux/check_native.c
View file

@ -167,7 +167,7 @@ __check_native (uint32_t a1_index, int *a1_native,
while (! done); while (! done);
out: out:
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
return; return;

2
sysdeps/unix/sysv/linux/check_pf.c
View file

@ -328,7 +328,7 @@ __check_pf (bool *seen_ipv4, bool *seen_ipv6,
&addr_len) == 0) &addr_len) == 0)
data = make_request (fd, nladdr.nl_pid); data = make_request (fd, nladdr.nl_pid);
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
} }
if (data != NULL) if (data != NULL)

12
sysdeps/unix/sysv/linux/close.c
View file

@ -18,6 +18,7 @@
#include <unistd.h> #include <unistd.h>
#include <sysdep-cancel.h> #include <sysdep-cancel.h>
#include <not-cancel.h>
/* Close the file descriptor FD. */ /* Close the file descriptor FD. */
int int
@ -28,3 +29,14 @@ __close (int fd)
libc_hidden_def (__close) libc_hidden_def (__close)
strong_alias (__close, __libc_close) strong_alias (__close, __libc_close)
weak_alias (__close, close) weak_alias (__close, close)
# if !IS_IN (rtld)
int
__close_nocancel (int fd)
{
return INLINE_SYSCALL_CALL (close, fd);
}
#else
strong_alias (__libc_close, __close_nocancel)
#endif
libc_hidden_def (__close_nocancel)

2
sysdeps/unix/sysv/linux/fips-private.h
View file

@ -50,7 +50,7 @@ fips_enabled_p (void)
char buf[32]; char buf[32];
ssize_t n; ssize_t n;
n = TEMP_FAILURE_RETRY (__read_nocancel (fd, buf, sizeof (buf) - 1)); n = TEMP_FAILURE_RETRY (__read_nocancel (fd, buf, sizeof (buf) - 1));
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
if (n > 0) if (n > 0)
{ {

4
sysdeps/unix/sysv/linux/gethostid.c
View file

@ -53,7 +53,7 @@ sethostid (long int id)
written = __write_nocancel (fd, &id32, sizeof (id32)); written = __write_nocancel (fd, &id32, sizeof (id32));
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
return written != sizeof (id32) ? -1 : 0; return written != sizeof (id32) ? -1 : 0;
} }
@ -82,7 +82,7 @@ gethostid (void)
{ {
ssize_t n = __read_nocancel (fd, &id, sizeof (id)); ssize_t n = __read_nocancel (fd, &id, sizeof (id));
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
if (n == sizeof (id)) if (n == sizeof (id))
return id; return id;

2
sysdeps/unix/sysv/linux/getloadavg.c
View file

@ -43,7 +43,7 @@ getloadavg (double loadavg[], int nelem)
int i; int i;
nread = __read_nocancel (fd, buf, sizeof buf - 1); nread = __read_nocancel (fd, buf, sizeof buf - 1);
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
if (nread <= 0) if (nread <= 0)
return -1; return -1;
buf[nread - 1] = '\0'; buf[nread - 1] = '\0';

2
sysdeps/unix/sysv/linux/getlogin_r.c
View file

@ -43,7 +43,7 @@ __getlogin_r_loginuid (char *name, size_t namesize)
char uidbuf[12]; char uidbuf[12];
ssize_t n = TEMP_FAILURE_RETRY (__read_nocancel (fd, uidbuf, ssize_t n = TEMP_FAILURE_RETRY (__read_nocancel (fd, uidbuf,
sizeof (uidbuf))); sizeof (uidbuf)));
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
uid_t uid; uid_t uid;
char *endp; char *endp;

6
sysdeps/unix/sysv/linux/getsysstats.c
View file

@ -180,7 +180,7 @@ __get_nprocs (void)
} }
while (l < re); while (l < re);
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
if (result > 0) if (result > 0)
goto out; goto out;
@ -207,7 +207,7 @@ __get_nprocs (void)
else if (isdigit (l[3])) else if (isdigit (l[3]))
++result; ++result;
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
} }
else else
{ {
@ -215,7 +215,7 @@ __get_nprocs (void)
if (fd != -1) if (fd != -1)
{ {
GET_NPROCS_PARSER (fd, buffer, cp, re, buffer_end, result); GET_NPROCS_PARSER (fd, buffer, cp, re, buffer_end, result);
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
} }
} }

2
sysdeps/unix/sysv/linux/grantpt.c
View file

@ -26,7 +26,7 @@ close_all_fds (void)
char *endp; char *endp;
long int fd = strtol (d->d_name, &endp, 10); long int fd = strtol (d->d_name, &endp, 10);
if (*endp == '\0' && fd != PTY_FILENO && fd != dirfd (dir)) if (*endp == '\0' && fd != PTY_FILENO && fd != dirfd (dir))
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
} }
__closedir (dir); __closedir (dir);

2
sysdeps/unix/sysv/linux/i386/smp.h
View file

@ -47,7 +47,7 @@ is_smp_system (void)
/* This also didn't work. We give up and say it's a UP machine. */ /* This also didn't work. We give up and say it's a UP machine. */
u.buf[0] = '\0'; u.buf[0] = '\0';
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
cp = u.buf; cp = u.buf;
} }

2
sysdeps/unix/sysv/linux/ia64/has_cpuclock.c
View file

@ -41,7 +41,7 @@ has_cpuclock (void)
|| buf[0] != '0' || buf[1] != '\n') || buf[0] != '0' || buf[1] != '\n')
newval = -1; newval = -1;
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
} }
itc_usable = newval; itc_usable = newval;

6
sysdeps/unix/sysv/linux/if_index.c
View file

@ -47,12 +47,12 @@ __if_nametoindex (const char *ifname)
if (__ioctl (fd, SIOCGIFINDEX, &ifr) < 0) if (__ioctl (fd, SIOCGIFINDEX, &ifr) < 0)
{ {
int saved_errno = errno; int saved_errno = errno;
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
if (saved_errno == EINVAL) if (saved_errno == EINVAL)
__set_errno (ENOSYS); __set_errno (ENOSYS);
return 0; return 0;
} }
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
return ifr.ifr_ifindex; return ifr.ifr_ifindex;
#endif #endif
} }
@ -224,7 +224,7 @@ __if_indextoname (unsigned int ifindex, char *ifname)
ifr.ifr_ifindex = ifindex; ifr.ifr_ifindex = ifindex;
status = __ioctl (fd, SIOCGIFNAME, &ifr); status = __ioctl (fd, SIOCGIFNAME, &ifr);
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
if (status < 0) if (status < 0)
{ {

2
sysdeps/unix/sysv/linux/libc_fatal.c
View file

@ -59,7 +59,7 @@ backtrace_and_maps (int do_abort, bool written, int fd)
while ((n2 = __read_nocancel (fd2, buf, sizeof (buf))) > 0) while ((n2 = __read_nocancel (fd2, buf, sizeof (buf))) > 0)
if (__write_nocancel (fd, buf, n2) != n2) if (__write_nocancel (fd, buf, n2) != n2)
break; break;
close_not_cancel_no_status (fd2); __close_nocancel_nostatus (fd2);
} }
} }
} }

2
sysdeps/unix/sysv/linux/malloc-sysdep.h
View file

@ -49,7 +49,7 @@ check_may_shrink_heap (void)
char val; char val;
ssize_t n = __read_nocancel (fd, &val, 1); ssize_t n = __read_nocancel (fd, &val, 1);
may_shrink_heap = n > 0 && val == '2'; may_shrink_heap = n > 0 && val == '2';
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
} }
} }

2
sysdeps/unix/sysv/linux/mq_notify.c
View file

@ -209,7 +209,7 @@ init_mq_netlink (void)
if (err != 0) if (err != 0)
{ {
close_not_cancel_no_status (netlink_socket); __close_nocancel_nostatus (netlink_socket);
netlink_socket = -1; netlink_socket = -1;
} }
} }

17
sysdeps/unix/sysv/linux/not-cancel.h
View file

@ -51,13 +51,16 @@ __typeof (__write) __write_nocancel;
libc_hidden_proto (__write_nocancel) libc_hidden_proto (__write_nocancel)
/* Uncancelable close. */ /* Uncancelable close. */
#define __close_nocancel(fd) \ __typeof (__close) __close_nocancel;
INLINE_SYSCALL (close, 1, fd) libc_hidden_proto (__close_nocancel)
#define close_not_cancel(fd) \
__close_nocancel (fd) /* Non cancellable close syscall that does not also set errno in case of
#define close_not_cancel_no_status(fd) \ failure. */
(void) ({ INTERNAL_SYSCALL_DECL (err); \ static inline void
INTERNAL_SYSCALL (close, err, 1, (fd)); }) __close_nocancel_nostatus (int fd)
{
__close_nocancel (fd);
}
/* Uncancelable writev. */ /* Uncancelable writev. */
#define writev_not_cancel_no_status(fd, iov, n) \ #define writev_not_cancel_no_status(fd, iov, n) \

2
sysdeps/unix/sysv/linux/pthread_getname.c
View file

@ -63,7 +63,7 @@ pthread_getname_np (pthread_t th, char *buf, size_t len)
buf[n] = '\0'; buf[n] = '\0';
} }
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
return res; return res;
} }

2
sysdeps/unix/sysv/linux/pthread_setname.c
View file

@ -57,7 +57,7 @@ pthread_setname_np (pthread_t th, const char *name)
else if (n != name_len) else if (n != name_len)
res = EIO; res = EIO;
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
return res; return res;
} }

6
sysdeps/unix/sysv/linux/spawni.c
View file

@ -205,7 +205,7 @@ __spawni_child (void *arguments)
switch (action->tag) switch (action->tag)
{ {
case spawn_do_close: case spawn_do_close:
if (close_not_cancel (action->action.close_action.fd) != 0) if (__close_nocancel (action->action.close_action.fd) != 0)
{ {
if (!have_fdlimit) if (!have_fdlimit)
{ {
@ -228,7 +228,7 @@ __spawni_child (void *arguments)
with the process already at maximum number of file descriptor with the process already at maximum number of file descriptor
opened and also for multiple actions on single-open special opened and also for multiple actions on single-open special
paths (like /dev/watchdog). */ paths (like /dev/watchdog). */
close_not_cancel (action->action.open_action.fd); __close_nocancel (action->action.open_action.fd);
int ret = __open_nocancel (action->action.open_action.path, int ret = __open_nocancel (action->action.open_action.path,
action->action. action->action.
@ -247,7 +247,7 @@ __spawni_child (void *arguments)
!= action->action.open_action.fd) != action->action.open_action.fd)
goto fail; goto fail;
if (close_not_cancel (new_fd) != 0) if (__close_nocancel (new_fd) != 0)
goto fail; goto fail;
} }
} }

2
sysdeps/unix/sysv/linux/sysconf.c
View file

@ -122,7 +122,7 @@ __sysconf (int name)
char buf[32]; char buf[32];
ssize_t n; ssize_t n;
n = TEMP_FAILURE_RETRY (__read_nocancel (fd, buf, sizeof (buf) - 1)); n = TEMP_FAILURE_RETRY (__read_nocancel (fd, buf, sizeof (buf) - 1));
close_not_cancel_no_status (fd); __close_nocancel_nostatus (fd);
if (n > 0) if (n > 0)
{ {