posix: execvpe cleanup
This patch removes all the dynamic allocation on execvpe code and
instead use direct stack allocation. This is QoI approach to make
it possible use in scenarios where memory is shared with parent
(vfork or clone with CLONE_VM).
For default process spawn (script file without a shebang), stack
allocation is bounded by NAME_MAX plus PATH_MAX plus 1. Large
file arguments returns an error (ENAMETOOLONG). This differs than
current GLIBC pratice in general, but it used to limit stack
allocation for large inputs. Also, path in PATH environment variable
larger than PATH_MAX are ignored.
The shell direct execution exeception, where execve returns ENOEXEC,
might requires a large stack allocation due large input argument list.
Tested on i686, x86_64, powerpc64le, and aarch64.
* posix/execvpe.c (__execvpe): Remove dynamic allocation.
* posix/Makefile (tests): Add tst-execvpe{1,2,3,4,5,6}.
* posix/tst-execvp1.c (do_test): Use a macro to call execvp.
* posix/tst-execvp2.c (do_test): Likewise.
* posix/tst-execvp3.c (do_test): Likewise.
* posix/tst-execvp4.c (do_test): Likewise.
* posix/tst-execvpe1.c: New file.
* posix/tst-execvpe2.c: Likewise.
* posix/tst-execvpe3.c: Likewise.
* posix/tst-execvpe4.c: Likewise.
* posix/tst-execvpe5.c: Likewise.
* posix/tst-execvpe6.c: Likewise.
2016-01-22 11:58:49 +00:00
|
|
|
/* Check execvpe script argument handling.
|
2022-01-01 18:54:23 +00:00
|
|
|
Copyright (C) 2016-2022 Free Software Foundation, Inc.
|
posix: execvpe cleanup
This patch removes all the dynamic allocation on execvpe code and
instead use direct stack allocation. This is QoI approach to make
it possible use in scenarios where memory is shared with parent
(vfork or clone with CLONE_VM).
For default process spawn (script file without a shebang), stack
allocation is bounded by NAME_MAX plus PATH_MAX plus 1. Large
file arguments returns an error (ENAMETOOLONG). This differs than
current GLIBC pratice in general, but it used to limit stack
allocation for large inputs. Also, path in PATH environment variable
larger than PATH_MAX are ignored.
The shell direct execution exeception, where execve returns ENOEXEC,
might requires a large stack allocation due large input argument list.
Tested on i686, x86_64, powerpc64le, and aarch64.
* posix/execvpe.c (__execvpe): Remove dynamic allocation.
* posix/Makefile (tests): Add tst-execvpe{1,2,3,4,5,6}.
* posix/tst-execvp1.c (do_test): Use a macro to call execvp.
* posix/tst-execvp2.c (do_test): Likewise.
* posix/tst-execvp3.c (do_test): Likewise.
* posix/tst-execvp4.c (do_test): Likewise.
* posix/tst-execvpe1.c: New file.
* posix/tst-execvpe2.c: Likewise.
* posix/tst-execvpe3.c: Likewise.
* posix/tst-execvpe4.c: Likewise.
* posix/tst-execvpe5.c: Likewise.
* posix/tst-execvpe6.c: Likewise.
2016-01-22 11:58:49 +00:00
|
|
|
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
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
<https://www.gnu.org/licenses/>. */
|
posix: execvpe cleanup
This patch removes all the dynamic allocation on execvpe code and
instead use direct stack allocation. This is QoI approach to make
it possible use in scenarios where memory is shared with parent
(vfork or clone with CLONE_VM).
For default process spawn (script file without a shebang), stack
allocation is bounded by NAME_MAX plus PATH_MAX plus 1. Large
file arguments returns an error (ENAMETOOLONG). This differs than
current GLIBC pratice in general, but it used to limit stack
allocation for large inputs. Also, path in PATH environment variable
larger than PATH_MAX are ignored.
The shell direct execution exeception, where execve returns ENOEXEC,
might requires a large stack allocation due large input argument list.
Tested on i686, x86_64, powerpc64le, and aarch64.
* posix/execvpe.c (__execvpe): Remove dynamic allocation.
* posix/Makefile (tests): Add tst-execvpe{1,2,3,4,5,6}.
* posix/tst-execvp1.c (do_test): Use a macro to call execvp.
* posix/tst-execvp2.c (do_test): Likewise.
* posix/tst-execvp3.c (do_test): Likewise.
* posix/tst-execvp4.c (do_test): Likewise.
* posix/tst-execvpe1.c: New file.
* posix/tst-execvpe2.c: Likewise.
* posix/tst-execvpe3.c: Likewise.
* posix/tst-execvpe4.c: Likewise.
* posix/tst-execvpe5.c: Likewise.
* posix/tst-execvpe6.c: Likewise.
2016-01-22 11:58:49 +00:00
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <sys/param.h>
|
|
|
|
|
|
|
|
static char *fname1;
|
|
|
|
static char *fname2;
|
|
|
|
static char *logname;
|
|
|
|
|
|
|
|
static void do_prepare (void);
|
|
|
|
#define PREPARE(argc, argv) do_prepare ()
|
|
|
|
static int do_test (void);
|
|
|
|
#define TEST_FUNCTION do_test ()
|
|
|
|
|
|
|
|
#include "../test-skeleton.c"
|
|
|
|
|
|
|
|
static void
|
|
|
|
do_prepare (void)
|
|
|
|
{
|
|
|
|
int logfd = create_temp_file ("logfile", &logname);
|
|
|
|
close (logfd);
|
|
|
|
|
|
|
|
int fd1 = create_temp_file ("testscript", &fname1);
|
|
|
|
dprintf (fd1, "echo foo $1 $2 $3 > %s\n", logname);
|
|
|
|
fchmod (fd1, 0700);
|
|
|
|
close (fd1);
|
|
|
|
|
|
|
|
int fd2 = create_temp_file ("testscript", &fname2);
|
|
|
|
dprintf (fd2, "echo foo > %s\n", logname);
|
|
|
|
fchmod (fd2, 0700);
|
|
|
|
close (fd2);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
run_script (const char *fname, char *args[])
|
|
|
|
{
|
|
|
|
/* We want to test the `execvpe' function. To do this we restart the
|
|
|
|
program with an additional parameter. */
|
|
|
|
int status;
|
|
|
|
pid_t pid = fork ();
|
|
|
|
if (pid == 0)
|
|
|
|
{
|
|
|
|
execvpe (fname, args, NULL);
|
|
|
|
|
|
|
|
puts ("Cannot exec");
|
|
|
|
exit (EXIT_FAILURE);
|
|
|
|
}
|
|
|
|
else if (pid == (pid_t) -1)
|
|
|
|
{
|
|
|
|
puts ("Cannot fork");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Wait for the child. */
|
|
|
|
if (waitpid (pid, &status, 0) != pid)
|
|
|
|
{
|
|
|
|
puts ("Wrong child");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (WTERMSIG (status) != 0)
|
|
|
|
{
|
|
|
|
puts ("Child terminated incorrectly");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
check_output (const char *expected)
|
|
|
|
{
|
|
|
|
/* Check log output. */
|
|
|
|
FILE *arq = fopen (logname, "r");
|
|
|
|
if (arq == NULL)
|
|
|
|
{
|
|
|
|
puts ("Error opening output file");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
char line[128];
|
|
|
|
if (fgets (line, sizeof (line), arq) == NULL)
|
|
|
|
{
|
|
|
|
puts ("Error reading output file");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
fclose (arq);
|
|
|
|
|
|
|
|
if (strcmp (line, expected) != 0)
|
|
|
|
{
|
|
|
|
puts ("Output file different than expected");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
do_test (void)
|
|
|
|
{
|
|
|
|
if (setenv ("PATH", test_dir, 1) != 0)
|
|
|
|
{
|
|
|
|
puts ("setenv failed");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* First check resulting script run with some arguments results in correct
|
|
|
|
output file. */
|
|
|
|
char *args1[] = { fname1, (char*) "1", (char *) "2", (char *) "3", NULL };
|
|
|
|
if (run_script (fname1,args1))
|
|
|
|
return 1;
|
|
|
|
if (check_output ("foo 1 2 3\n"))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
/* Same as before but with an expected empty argument list. */
|
|
|
|
char *args2[] = { fname2, NULL };
|
|
|
|
if (run_script (fname2, args2))
|
|
|
|
return 1;
|
|
|
|
if (check_output ("foo\n"))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
/* Same as before but with an empty argument list. */
|
|
|
|
char *args3[] = { NULL };
|
|
|
|
if (run_script (fname2, args3))
|
|
|
|
return 1;
|
|
|
|
if (check_output ("foo\n"))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|