mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-11-03 20:53:13 +03:00 
			
		
		
		
	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.
		
	
		
			
				
	
	
		
			119 lines
		
	
	
		
			3.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			119 lines
		
	
	
		
			3.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/* Copyright (C) 1995-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 <alloca.h>
 | 
						|
#include <errno.h>
 | 
						|
#include <fcntl.h>
 | 
						|
#include <unistd.h>
 | 
						|
#include <netdb.h>
 | 
						|
#include <not-cancel.h>
 | 
						|
 | 
						|
#define HOSTIDFILE "/etc/hostid"
 | 
						|
 | 
						|
#ifdef SET_PROCEDURE
 | 
						|
int
 | 
						|
sethostid (long int id)
 | 
						|
{
 | 
						|
  int fd;
 | 
						|
  ssize_t written;
 | 
						|
  int32_t id32 = id;
 | 
						|
 | 
						|
  /* Test for appropriate rights to set host ID.  */
 | 
						|
  if (__libc_enable_secure)
 | 
						|
    {
 | 
						|
      __set_errno (EPERM);
 | 
						|
      return -1;
 | 
						|
    }
 | 
						|
 | 
						|
  /* Make sure the ID is not too large.  Needed for bi-arch support.   */
 | 
						|
  if (id32 != id)
 | 
						|
    {
 | 
						|
      __set_errno (EOVERFLOW);
 | 
						|
      return -1;
 | 
						|
    }
 | 
						|
 | 
						|
  /* Open file for writing.  Everybody is allowed to read this file.  */
 | 
						|
  fd = __open_nocancel (HOSTIDFILE, O_CREAT|O_WRONLY|O_TRUNC, 0644);
 | 
						|
  if (fd < 0)
 | 
						|
    return -1;
 | 
						|
 | 
						|
  written = __write_nocancel (fd, &id32, sizeof (id32));
 | 
						|
 | 
						|
  __close_nocancel_nostatus (fd);
 | 
						|
 | 
						|
  return written != sizeof (id32) ? -1 : 0;
 | 
						|
}
 | 
						|
 | 
						|
#else
 | 
						|
# include <string.h>
 | 
						|
# include <sys/param.h>
 | 
						|
# include <resolv/netdb.h>
 | 
						|
# include <netinet/in.h>
 | 
						|
 | 
						|
long int
 | 
						|
gethostid (void)
 | 
						|
{
 | 
						|
  char hostname[MAXHOSTNAMELEN + 1];
 | 
						|
  size_t buflen;
 | 
						|
  char *buffer;
 | 
						|
  struct hostent hostbuf, *hp;
 | 
						|
  int32_t id;
 | 
						|
  struct in_addr in;
 | 
						|
  int herr;
 | 
						|
  int fd;
 | 
						|
 | 
						|
  /* First try to get the ID from a former invocation of sethostid.  */
 | 
						|
  fd = __open_nocancel (HOSTIDFILE, O_RDONLY|O_LARGEFILE, 0);
 | 
						|
  if (fd >= 0)
 | 
						|
    {
 | 
						|
      ssize_t n = __read_nocancel (fd, &id, sizeof (id));
 | 
						|
 | 
						|
      __close_nocancel_nostatus (fd);
 | 
						|
 | 
						|
      if (n == sizeof (id))
 | 
						|
	return id;
 | 
						|
    }
 | 
						|
 | 
						|
  /* Getting from the file was not successful.  An intelligent guess for
 | 
						|
     a unique number of a host is its IP address.  Return this.  */
 | 
						|
  if (__gethostname (hostname, MAXHOSTNAMELEN) < 0 || hostname[0] == '\0')
 | 
						|
    /* This also fails.  Return and arbitrary value.  */
 | 
						|
    return 0;
 | 
						|
 | 
						|
  buflen = 1024;
 | 
						|
  buffer = __alloca (buflen);
 | 
						|
 | 
						|
  /* To get the IP address we need to know the host name.  */
 | 
						|
  while (__gethostbyname_r (hostname, &hostbuf, buffer, buflen, &hp, &herr)
 | 
						|
	 != 0
 | 
						|
	 || hp == NULL)
 | 
						|
    if (herr != NETDB_INTERNAL || errno != ERANGE)
 | 
						|
      return 0;
 | 
						|
    else
 | 
						|
      /* Enlarge buffer.  */
 | 
						|
      buffer = extend_alloca (buffer, buflen, 2 * buflen);
 | 
						|
 | 
						|
  in.s_addr = 0;
 | 
						|
  memcpy (&in, hp->h_addr,
 | 
						|
	  (int) sizeof (in) < hp->h_length ? (int) sizeof (in) : hp->h_length);
 | 
						|
 | 
						|
  /* For the return value to be not exactly the IP address we do some
 | 
						|
     bit fiddling.  */
 | 
						|
  return (int32_t) (in.s_addr << 16 | in.s_addr >> 16);
 | 
						|
}
 | 
						|
#endif
 |