mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-11-03 20:53:13 +03:00 
			
		
		
		
	posix_spawn (a standard POSIX function) brings in a use of getrlimit64 (not a standard POSIX function). This patch fixes this by using __getrlimit64 and making getrlimit64 a weak alias. This is more complicated than some such changes because of files that define getrlimit64 in their own way using symbol versioning after including the main sysdeps/unix/sysv/linux/getrlimit64.c with a getrlimit macro defined. There are various existing patterns for such cases in glibc; the one I've used here is that a getrlimit64 macro disables the weak_alias / libc_hidden_weak calls, leaving it to the including file to define the getrlimit64 name in whatever way is appropriate. Tested for x86_64 and x86 that installed stripped shared libraries are unchanged by this patch. [BZ #17991] * include/sys/resource.h (__getrlimit64): Declare. Use libc_hidden_proto. * resource/getrlimit64.c (getrlimit64): Rename to __getrlimit64 and define as weak alias of __getrlimit64. Use libc_hidden_weak. * sysdeps/posix/spawni.c (__spawni): Call __getrlimit64 instead of getrlimit64. * sysdeps/unix/sysv/linux/getrlimit64.c (getrlimit64): Rename to __getrlimit64. [!getrlimit64] (getrlimit64): Define as weak alias of __getrlimit64. Use libc_hidden_weak. * sysdeps/unix/sysv/linux/i386/getrlimit64.c (getrlimit64): Define using __getrlimit64 not __new_getrlimit64. (__GI_getrlimit64): Likewise. * sysdeps/unix/sysv/linux/mips/getrlimit64.c (getrlimit64): Likewise. (__GI_getrlimit64): Likewise. (__old_getrlimit64): Use __getrlimit64 not __new_getrlimit64. * sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list (getrlimit): Add __getrlimit64 alias. * sysdeps/unix/sysv/linux/wordsize-64/syscalls.list (getrlimit): Likewise. * conform/Makefile (test-xfail-XOPEN2K/spawn.h/linknamespace): Remove variable. (test-xfail-POSIX2008/spawn.h/linknamespace): Likewise. (test-xfail-XOPEN2K8/spawn.h/linknamespace): Likewise.
		
			
				
	
	
		
			315 lines
		
	
	
		
			8.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			315 lines
		
	
	
		
			8.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/* Guts of POSIX spawn interface.  Generic POSIX.1 version.
 | 
						|
   Copyright (C) 2000-2015 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 <errno.h>
 | 
						|
#include <fcntl.h>
 | 
						|
#include <paths.h>
 | 
						|
#include <spawn.h>
 | 
						|
#include <stdbool.h>
 | 
						|
#include <stdlib.h>
 | 
						|
#include <string.h>
 | 
						|
#include <unistd.h>
 | 
						|
#include <signal.h>
 | 
						|
#include <sys/resource.h>
 | 
						|
#include "spawn_int.h"
 | 
						|
#include <not-cancel.h>
 | 
						|
#include <local-setxid.h>
 | 
						|
#include <shlib-compat.h>
 | 
						|
 | 
						|
 | 
						|
/* The Unix standard contains a long explanation of the way to signal
 | 
						|
   an error after the fork() was successful.  Since no new wait status
 | 
						|
   was wanted there is no way to signal an error using one of the
 | 
						|
   available methods.  The committee chose to signal an error by a
 | 
						|
   normal program exit with the exit code 127.  */
 | 
						|
#define SPAWN_ERROR	127
 | 
						|
 | 
						|
 | 
						|
/* The file is accessible but it is not an executable file.  Invoke
 | 
						|
   the shell to interpret it as a script.  */
 | 
						|
static void
 | 
						|
internal_function
 | 
						|
script_execute (const char *file, char *const argv[], char *const envp[])
 | 
						|
{
 | 
						|
  /* Count the arguments.  */
 | 
						|
  int argc = 0;
 | 
						|
  while (argv[argc++])
 | 
						|
    ;
 | 
						|
 | 
						|
  /* Construct an argument list for the shell.  */
 | 
						|
  {
 | 
						|
    char *new_argv[argc + 1];
 | 
						|
    new_argv[0] = (char *) _PATH_BSHELL;
 | 
						|
    new_argv[1] = (char *) file;
 | 
						|
    while (argc > 1)
 | 
						|
      {
 | 
						|
	new_argv[argc] = argv[argc - 1];
 | 
						|
	--argc;
 | 
						|
      }
 | 
						|
 | 
						|
    /* Execute the shell.  */
 | 
						|
    __execve (new_argv[0], new_argv, envp);
 | 
						|
  }
 | 
						|
}
 | 
						|
 | 
						|
static inline void
 | 
						|
maybe_script_execute (const char *file, char *const argv[], char *const envp[],
 | 
						|
                      int xflags)
 | 
						|
{
 | 
						|
  if (SHLIB_COMPAT (libc, GLIBC_2_2, GLIBC_2_15)
 | 
						|
      && (xflags & SPAWN_XFLAGS_TRY_SHELL)
 | 
						|
      && errno == ENOEXEC)
 | 
						|
    script_execute (file, argv, envp);
 | 
						|
}
 | 
						|
 | 
						|
/* Spawn a new process executing PATH with the attributes describes in *ATTRP.
 | 
						|
   Before running the process perform the actions described in FILE-ACTIONS. */
 | 
						|
int
 | 
						|
__spawni (pid_t *pid, const char *file,
 | 
						|
	  const posix_spawn_file_actions_t *file_actions,
 | 
						|
	  const posix_spawnattr_t *attrp, char *const argv[],
 | 
						|
	  char *const envp[], int xflags)
 | 
						|
{
 | 
						|
  pid_t new_pid;
 | 
						|
  char *path, *p, *name;
 | 
						|
  size_t len;
 | 
						|
  size_t pathlen;
 | 
						|
 | 
						|
  /* Do this once.  */
 | 
						|
  short int flags = attrp == NULL ? 0 : attrp->__flags;
 | 
						|
 | 
						|
  /* Generate the new process.  */
 | 
						|
  if ((flags & POSIX_SPAWN_USEVFORK) != 0
 | 
						|
      /* If no major work is done, allow using vfork.  Note that we
 | 
						|
	 might perform the path searching.  But this would be done by
 | 
						|
	 a call to execvp(), too, and such a call must be OK according
 | 
						|
	 to POSIX.  */
 | 
						|
      || ((flags & (POSIX_SPAWN_SETSIGMASK | POSIX_SPAWN_SETSIGDEF
 | 
						|
		    | POSIX_SPAWN_SETSCHEDPARAM | POSIX_SPAWN_SETSCHEDULER
 | 
						|
		    | POSIX_SPAWN_SETPGROUP | POSIX_SPAWN_RESETIDS)) == 0
 | 
						|
	  && file_actions == NULL))
 | 
						|
    new_pid = __vfork ();
 | 
						|
  else
 | 
						|
    new_pid = __fork ();
 | 
						|
 | 
						|
  if (new_pid != 0)
 | 
						|
    {
 | 
						|
      if (new_pid < 0)
 | 
						|
	return errno;
 | 
						|
 | 
						|
      /* The call was successful.  Store the PID if necessary.  */
 | 
						|
      if (pid != NULL)
 | 
						|
	*pid = new_pid;
 | 
						|
 | 
						|
      return 0;
 | 
						|
    }
 | 
						|
 | 
						|
  /* Set signal mask.  */
 | 
						|
  if ((flags & POSIX_SPAWN_SETSIGMASK) != 0
 | 
						|
      && __sigprocmask (SIG_SETMASK, &attrp->__ss, NULL) != 0)
 | 
						|
    _exit (SPAWN_ERROR);
 | 
						|
 | 
						|
  /* Set signal default action.  */
 | 
						|
  if ((flags & POSIX_SPAWN_SETSIGDEF) != 0)
 | 
						|
    {
 | 
						|
      /* We have to iterate over all signals.  This could possibly be
 | 
						|
	 done better but it requires system specific solutions since
 | 
						|
	 the sigset_t data type can be very different on different
 | 
						|
	 architectures.  */
 | 
						|
      int sig;
 | 
						|
      struct sigaction sa;
 | 
						|
 | 
						|
      memset (&sa, '\0', sizeof (sa));
 | 
						|
      sa.sa_handler = SIG_DFL;
 | 
						|
 | 
						|
      for (sig = 1; sig <= _NSIG; ++sig)
 | 
						|
	if (__sigismember (&attrp->__sd, sig) != 0
 | 
						|
	    && __sigaction (sig, &sa, NULL) != 0)
 | 
						|
	  _exit (SPAWN_ERROR);
 | 
						|
 | 
						|
    }
 | 
						|
 | 
						|
#ifdef _POSIX_PRIORITY_SCHEDULING
 | 
						|
  /* Set the scheduling algorithm and parameters.  */
 | 
						|
  if ((flags & (POSIX_SPAWN_SETSCHEDPARAM | POSIX_SPAWN_SETSCHEDULER))
 | 
						|
      == POSIX_SPAWN_SETSCHEDPARAM)
 | 
						|
    {
 | 
						|
      if (__sched_setparam (0, &attrp->__sp) == -1)
 | 
						|
	_exit (SPAWN_ERROR);
 | 
						|
    }
 | 
						|
  else if ((flags & POSIX_SPAWN_SETSCHEDULER) != 0)
 | 
						|
    {
 | 
						|
      if (__sched_setscheduler (0, attrp->__policy, &attrp->__sp) == -1)
 | 
						|
	_exit (SPAWN_ERROR);
 | 
						|
    }
 | 
						|
#endif
 | 
						|
 | 
						|
  /* Set the process group ID.  */
 | 
						|
  if ((flags & POSIX_SPAWN_SETPGROUP) != 0
 | 
						|
      && __setpgid (0, attrp->__pgrp) != 0)
 | 
						|
    _exit (SPAWN_ERROR);
 | 
						|
 | 
						|
  /* Set the effective user and group IDs.  */
 | 
						|
  if ((flags & POSIX_SPAWN_RESETIDS) != 0
 | 
						|
      && (local_seteuid (__getuid ()) != 0
 | 
						|
	  || local_setegid (__getgid ()) != 0))
 | 
						|
    _exit (SPAWN_ERROR);
 | 
						|
 | 
						|
  /* Execute the file actions.  */
 | 
						|
  if (file_actions != NULL)
 | 
						|
    {
 | 
						|
      int cnt;
 | 
						|
      struct rlimit64 fdlimit;
 | 
						|
      bool have_fdlimit = false;
 | 
						|
 | 
						|
      for (cnt = 0; cnt < file_actions->__used; ++cnt)
 | 
						|
	{
 | 
						|
	  struct __spawn_action *action = &file_actions->__actions[cnt];
 | 
						|
 | 
						|
	  switch (action->tag)
 | 
						|
	    {
 | 
						|
	    case spawn_do_close:
 | 
						|
	      if (close_not_cancel (action->action.close_action.fd) != 0)
 | 
						|
		{
 | 
						|
		  if (! have_fdlimit)
 | 
						|
		    {
 | 
						|
		      __getrlimit64 (RLIMIT_NOFILE, &fdlimit);
 | 
						|
		      have_fdlimit = true;
 | 
						|
		    }
 | 
						|
 | 
						|
		  /* Only signal errors for file descriptors out of range.  */
 | 
						|
		  if (action->action.close_action.fd < 0
 | 
						|
		      || action->action.close_action.fd >= fdlimit.rlim_cur)
 | 
						|
		    /* Signal the error.  */
 | 
						|
		    _exit (SPAWN_ERROR);
 | 
						|
		}
 | 
						|
	      break;
 | 
						|
 | 
						|
	    case spawn_do_open:
 | 
						|
	      {
 | 
						|
		int new_fd = open_not_cancel (action->action.open_action.path,
 | 
						|
					      action->action.open_action.oflag
 | 
						|
					      | O_LARGEFILE,
 | 
						|
					      action->action.open_action.mode);
 | 
						|
 | 
						|
		if (new_fd == -1)
 | 
						|
		  /* The `open' call failed.  */
 | 
						|
		  _exit (SPAWN_ERROR);
 | 
						|
 | 
						|
		/* Make sure the desired file descriptor is used.  */
 | 
						|
		if (new_fd != action->action.open_action.fd)
 | 
						|
		  {
 | 
						|
		    if (__dup2 (new_fd, action->action.open_action.fd)
 | 
						|
			!= action->action.open_action.fd)
 | 
						|
		      /* The `dup2' call failed.  */
 | 
						|
		      _exit (SPAWN_ERROR);
 | 
						|
 | 
						|
		    if (close_not_cancel (new_fd) != 0)
 | 
						|
		      /* The `close' call failed.  */
 | 
						|
		      _exit (SPAWN_ERROR);
 | 
						|
		  }
 | 
						|
	      }
 | 
						|
	      break;
 | 
						|
 | 
						|
	    case spawn_do_dup2:
 | 
						|
	      if (__dup2 (action->action.dup2_action.fd,
 | 
						|
			  action->action.dup2_action.newfd)
 | 
						|
		  != action->action.dup2_action.newfd)
 | 
						|
		/* The `dup2' call failed.  */
 | 
						|
		_exit (SPAWN_ERROR);
 | 
						|
	      break;
 | 
						|
	    }
 | 
						|
	}
 | 
						|
    }
 | 
						|
 | 
						|
  if ((xflags & SPAWN_XFLAGS_USE_PATH) == 0 || strchr (file, '/') != NULL)
 | 
						|
    {
 | 
						|
      /* The FILE parameter is actually a path.  */
 | 
						|
      __execve (file, argv, envp);
 | 
						|
 | 
						|
      maybe_script_execute (file, argv, envp, xflags);
 | 
						|
 | 
						|
      /* Oh, oh.  `execve' returns.  This is bad.  */
 | 
						|
      _exit (SPAWN_ERROR);
 | 
						|
    }
 | 
						|
 | 
						|
  /* We have to search for FILE on the path.  */
 | 
						|
  path = getenv ("PATH");
 | 
						|
  if (path == NULL)
 | 
						|
    {
 | 
						|
      /* There is no `PATH' in the environment.
 | 
						|
	 The default search path is the current directory
 | 
						|
	 followed by the path `confstr' returns for `_CS_PATH'.  */
 | 
						|
      len = confstr (_CS_PATH, (char *) NULL, 0);
 | 
						|
      path = (char *) __alloca (1 + len);
 | 
						|
      path[0] = ':';
 | 
						|
      (void) confstr (_CS_PATH, path + 1, len);
 | 
						|
    }
 | 
						|
 | 
						|
  len = strlen (file) + 1;
 | 
						|
  pathlen = strlen (path);
 | 
						|
  name = __alloca (pathlen + len + 1);
 | 
						|
  /* Copy the file name at the top.  */
 | 
						|
  name = (char *) memcpy (name + pathlen + 1, file, len);
 | 
						|
  /* And add the slash.  */
 | 
						|
  *--name = '/';
 | 
						|
 | 
						|
  p = path;
 | 
						|
  do
 | 
						|
    {
 | 
						|
      char *startp;
 | 
						|
 | 
						|
      path = p;
 | 
						|
      p = __strchrnul (path, ':');
 | 
						|
 | 
						|
      if (p == path)
 | 
						|
	/* Two adjacent colons, or a colon at the beginning or the end
 | 
						|
	   of `PATH' means to search the current directory.  */
 | 
						|
	startp = name + 1;
 | 
						|
      else
 | 
						|
	startp = (char *) memcpy (name - (p - path), path, p - path);
 | 
						|
 | 
						|
      /* Try to execute this name.  If it works, execv will not return.  */
 | 
						|
      __execve (startp, argv, envp);
 | 
						|
 | 
						|
      maybe_script_execute (startp, argv, envp, xflags);
 | 
						|
 | 
						|
      switch (errno)
 | 
						|
	{
 | 
						|
	case EACCES:
 | 
						|
	case ENOENT:
 | 
						|
	case ESTALE:
 | 
						|
	case ENOTDIR:
 | 
						|
	  /* Those errors indicate the file is missing or not executable
 | 
						|
	     by us, in which case we want to just try the next path
 | 
						|
	     directory.  */
 | 
						|
	  break;
 | 
						|
 | 
						|
	default:
 | 
						|
	  /* Some other error means we found an executable file, but
 | 
						|
	     something went wrong executing it; return the error to our
 | 
						|
	     caller.  */
 | 
						|
	  _exit (SPAWN_ERROR);
 | 
						|
	    }
 | 
						|
    }
 | 
						|
  while (*p++ != '\0');
 | 
						|
 | 
						|
  /* Return with an error.  */
 | 
						|
  _exit (SPAWN_ERROR);
 | 
						|
}
 |