diff options
Diffstat (limited to 'posix')
| -rw-r--r-- | posix/Makefile | 4 | ||||
| -rw-r--r-- | posix/execvpe.c | 26 | ||||
| -rw-r--r-- | posix/tst-spawn4-compat.c | 77 | ||||
| -rw-r--r-- | posix/tst-spawn4.c | 56 |
4 files changed, 154 insertions, 9 deletions
diff --git a/posix/Makefile b/posix/Makefile index e9730eedf0..4a9a1b57b8 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -95,10 +95,10 @@ tests := test-errno tstgetopt testfnm runtests runptests \ tst-posix_spawn-fd tst-posix_spawn-setsid \ tst-posix_fadvise tst-posix_fadvise64 \ tst-sysconf-empty-chroot tst-glob_symlinks tst-fexecve \ - tst-glob-tilde test-ssize-max + tst-glob-tilde test-ssize-max tst-spawn4 tests-internal := bug-regex5 bug-regex20 bug-regex33 \ tst-rfc3484 tst-rfc3484-2 tst-rfc3484-3 \ - tst-glob_lstat_compat + tst-glob_lstat_compat tst-spawn4-compat xtests := bug-ga2 tst-getaddrinfo4 tst-getaddrinfo5 ifeq (yes,$(build-shared)) test-srcs := globtest diff --git a/posix/execvpe.c b/posix/execvpe.c index 859c0f69bf..ea67d19fcd 100644 --- a/posix/execvpe.c +++ b/posix/execvpe.c @@ -67,11 +67,9 @@ maybe_script_execute (const char *file, char *const argv[], char *const envp[]) __execve (new_argv[0], new_argv, envp); } - -/* Execute FILE, searching in the `PATH' environment variable if it contains - no slashes, with arguments ARGV and environment from ENVP. */ -int -__execvpe (const char *file, char *const argv[], char *const envp[]) +static int +__execvpe_common (const char *file, char *const argv[], char *const envp[], + bool exec_script) { /* We check the simple case first. */ if (*file == '\0') @@ -85,7 +83,7 @@ __execvpe (const char *file, char *const argv[], char *const envp[]) { __execve (file, argv, envp); - if (errno == ENOEXEC) + if (errno == ENOEXEC && exec_script) maybe_script_execute (file, argv, envp); return -1; @@ -137,7 +135,7 @@ __execvpe (const char *file, char *const argv[], char *const envp[]) __execve (buffer, argv, envp); - if (errno == ENOEXEC) + if (errno == ENOEXEC && exec_script) /* This has O(P*C) behavior, where P is the length of the path and C is the argument count. A better strategy would be allocate the substitute argv and reuse it each time through the loop (so it @@ -184,4 +182,18 @@ __execvpe (const char *file, char *const argv[], char *const envp[]) return -1; } +/* Execute FILE, searching in the `PATH' environment variable if it contains + no slashes, with arguments ARGV and environment from ENVP. */ +int +__execvpe (const char *file, char *const argv[], char *const envp[]) +{ + return __execvpe_common (file, argv, envp, true); +} weak_alias (__execvpe, execvpe) + +/* Same as __EXECVPE, but does not try to execute NOEXEC files. */ +int +__execvpex (const char *file, char *const argv[], char *const envp[]) +{ + return __execvpe_common (file, argv, envp, false); +} diff --git a/posix/tst-spawn4-compat.c b/posix/tst-spawn4-compat.c new file mode 100644 index 0000000000..11f654b913 --- /dev/null +++ b/posix/tst-spawn4-compat.c @@ -0,0 +1,77 @@ +/* Check if posix_spawn does handle correctly ENOEXEC files. + Copyright (C) 2018 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 <spawn.h> +#include <errno.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/wait.h> + +#include <support/xunistd.h> +#include <support/check.h> +#include <support/temp_file.h> + +#include <shlib-compat.h> +#if TEST_COMPAT (libc, GLIBC_2_0, GLIBC_2_15) + +compat_symbol_reference (libc, posix_spawn, posix_spawn, GLIBC_2_2); +compat_symbol_reference (libc, posix_spawnp, posix_spawnp, GLIBC_2_2); + +static int +do_test (void) +{ + char *scriptname; + int fd = create_temp_file ("tst-spawn4.", &scriptname); + TEST_VERIFY_EXIT (fd >= 0); + + const char script[] = "exit 65"; + xwrite (fd, script, sizeof (script) - 1); + xclose (fd); + + TEST_VERIFY_EXIT (chmod (scriptname, 0x775) == 0); + + pid_t pid; + int status; + + /* For compat symbol it verifies that trying to issued a shell script + without a shebang is correctly executed. */ + status = posix_spawn (&pid, scriptname, NULL, NULL, (char *[]) { 0 }, + (char *[]) { 0 }); + TEST_VERIFY_EXIT (status == 0); + + TEST_VERIFY_EXIT (waitpid (pid, &status, 0) == pid); + TEST_VERIFY_EXIT (WIFEXITED (status) == 1 && WEXITSTATUS (status) == 65); + + status = posix_spawnp (&pid, scriptname, NULL, NULL, (char *[]) { 0 }, + (char *[]) { 0 }); + TEST_VERIFY_EXIT (status == 0); + + TEST_VERIFY_EXIT (waitpid (pid, &status, 0) == pid); + TEST_VERIFY_EXIT (WIFEXITED (status) == 1 && WEXITSTATUS (status) == 65); + + return 0; +} +#else +static int +do_test (void) +{ + return 77; +} +#endif + +#include <support/test-driver.c> diff --git a/posix/tst-spawn4.c b/posix/tst-spawn4.c new file mode 100644 index 0000000000..e4a1fa3f00 --- /dev/null +++ b/posix/tst-spawn4.c @@ -0,0 +1,56 @@ +/* Check if posix_spawn does handle correctly ENOEXEC files. + Copyright (C) 2018 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 <spawn.h> +#include <errno.h> +#include <unistd.h> +#include <sys/stat.h> + +#include <support/xunistd.h> +#include <support/check.h> +#include <support/temp_file.h> + +static int +do_test (void) +{ + char *scriptname; + int fd = create_temp_file ("tst-spawn4.", &scriptname); + TEST_VERIFY_EXIT (fd >= 0); + + const char script[] = "echo it should not happen"; + xwrite (fd, script, sizeof (script) - 1); + xclose (fd); + + TEST_VERIFY_EXIT (chmod (scriptname, 0x775) == 0); + + pid_t pid; + int status; + + /* Check if scripts without shebang are correctly not executed. */ + status = posix_spawn (&pid, scriptname, NULL, NULL, (char *[]) { 0 }, + (char *[]) { 0 }); + TEST_VERIFY_EXIT (status == ENOEXEC); + + status = posix_spawnp (&pid, scriptname, NULL, NULL, (char *[]) { 0 }, + (char *[]) { 0 }); + TEST_VERIFY_EXIT (status == ENOEXEC); + + return 0; +} + +#include <support/test-driver.c> |