301cb491ea
If execve fails with ENOEXEC, execvp is expected to rebuild the command with /bin/sh instead and try again. The previous version did this, but overlooked two details: argv[0] can conceivably be NULL, in which case memp would never get terminated. We must allocate no less than three * sizeof(char *) so we can properly terminate at all times. For the non-NULL argv standard case, we count all the non-NULL elements and actually skip the first argument, so we end up capturing the NULL terminator in our bcopy(). The second detail is that the spec is actually worded such that we should have been preserving argv[0] as passed to execvp: "[...] executed command shall be as if the process invoked the sh utility using execl() as follows: execl(<shell path>, arg0, file, arg1, ..., (char *)0); where <shell path> is an unspecified pathname for the sh utility, file is the process image file, and for execvp(), where arg0, arg1, and so on correspond to the values passed to execvp() in argv[0], argv[1], and so on." So we make this change at this time as well, while we're already touching it. We decidedly can't preserve a NULL argv[0] as this would be incredibly, incredibly fragile, so we retain our legacy behavior of using "sh" for argv[] in this specific instance. Some light tests are added to try and detect some components of handling the ENOEXEC fallback; posix_spawnp_enoexec_fallback_null_argv0 is likely not 100% reliable, but it at least won't raise false-alarms and it did result in useful failures with pre-change libc on my machine. This is a secondary change in D25038. Reported by: Andrew Gierth <andrew_tao173.riddles.org.uk> Reviewed by: jilles, kib, Andrew Gierth MFC after: 1 week
143 lines
4.4 KiB
C
143 lines
4.4 KiB
C
/*-
|
|
* Copyright (c) 2011 Jilles Tjoelker
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
/*
|
|
* Test program for posix_spawn() and posix_spawnp() as specified by
|
|
* IEEE Std. 1003.1-2008.
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
#include <sys/wait.h>
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <spawn.h>
|
|
|
|
#include <atf-c.h>
|
|
|
|
char *myenv[2] = { "answer=42", NULL };
|
|
|
|
ATF_TC_WITHOUT_HEAD(posix_spawn_simple_test);
|
|
ATF_TC_BODY(posix_spawn_simple_test, tc)
|
|
{
|
|
char *myargs[4];
|
|
int error, status;
|
|
pid_t pid, waitres;
|
|
|
|
/* Make sure we have no child processes. */
|
|
while (waitpid(-1, NULL, 0) != -1)
|
|
;
|
|
ATF_REQUIRE_MSG(errno == ECHILD, "errno was not ECHILD: %d", errno);
|
|
|
|
/* Simple test. */
|
|
myargs[0] = "sh";
|
|
myargs[1] = "-c";
|
|
myargs[2] = "exit $answer";
|
|
myargs[3] = NULL;
|
|
error = posix_spawnp(&pid, myargs[0], NULL, NULL, myargs, myenv);
|
|
ATF_REQUIRE(error == 0);
|
|
waitres = waitpid(pid, &status, 0);
|
|
ATF_REQUIRE(waitres == pid);
|
|
ATF_REQUIRE(WIFEXITED(status) && WEXITSTATUS(status) == 42);
|
|
}
|
|
|
|
ATF_TC_WITHOUT_HEAD(posix_spawn_no_such_command_negative_test);
|
|
ATF_TC_BODY(posix_spawn_no_such_command_negative_test, tc)
|
|
{
|
|
char *myargs[4];
|
|
int error, status;
|
|
pid_t pid, waitres;
|
|
|
|
/*
|
|
* If the executable does not exist, the function shall either fail
|
|
* and not create a child process or succeed and create a child
|
|
* process that exits with status 127.
|
|
*/
|
|
myargs[0] = "/var/empty/nonexistent";
|
|
myargs[1] = NULL;
|
|
error = posix_spawn(&pid, myargs[0], NULL, NULL, myargs, myenv);
|
|
if (error == 0) {
|
|
waitres = waitpid(pid, &status, 0);
|
|
ATF_REQUIRE(waitres == pid);
|
|
ATF_REQUIRE(WIFEXITED(status) && WEXITSTATUS(status) == 127);
|
|
} else {
|
|
ATF_REQUIRE(error == ENOENT);
|
|
waitres = waitpid(-1, NULL, 0);
|
|
ATF_REQUIRE(waitres == -1 && errno == ECHILD);
|
|
}
|
|
}
|
|
|
|
ATF_TC_WITHOUT_HEAD(posix_spawnp_enoexec_fallback);
|
|
ATF_TC_BODY(posix_spawnp_enoexec_fallback, tc)
|
|
{
|
|
char buf[FILENAME_MAX];
|
|
char *myargs[2];
|
|
int error, status;
|
|
pid_t pid, waitres;
|
|
|
|
snprintf(buf, sizeof(buf), "%s/spawnp_enoexec.sh",
|
|
atf_tc_get_config_var(tc, "srcdir"));
|
|
myargs[0] = buf;
|
|
myargs[1] = NULL;
|
|
error = posix_spawnp(&pid, myargs[0], NULL, NULL, myargs, myenv);
|
|
ATF_REQUIRE(error == 0);
|
|
waitres = waitpid(pid, &status, 0);
|
|
ATF_REQUIRE(waitres == pid);
|
|
ATF_REQUIRE(WIFEXITED(status) && WEXITSTATUS(status) == 42);
|
|
}
|
|
|
|
ATF_TC_WITHOUT_HEAD(posix_spawnp_enoexec_fallback_null_argv0);
|
|
ATF_TC_BODY(posix_spawnp_enoexec_fallback_null_argv0, tc)
|
|
{
|
|
char buf[FILENAME_MAX];
|
|
char *myargs[1];
|
|
int error, status;
|
|
pid_t pid, waitres;
|
|
|
|
snprintf(buf, sizeof(buf), "%s/spawnp_enoexec.sh",
|
|
atf_tc_get_config_var(tc, "srcdir"));
|
|
myargs[0] = NULL;
|
|
error = posix_spawnp(&pid, buf, NULL, NULL, myargs, myenv);
|
|
ATF_REQUIRE(error == 0);
|
|
waitres = waitpid(pid, &status, 0);
|
|
ATF_REQUIRE(waitres == pid);
|
|
ATF_REQUIRE(WIFEXITED(status) && WEXITSTATUS(status) == 42);
|
|
}
|
|
|
|
ATF_TP_ADD_TCS(tp)
|
|
{
|
|
|
|
ATF_TP_ADD_TC(tp, posix_spawn_simple_test);
|
|
ATF_TP_ADD_TC(tp, posix_spawn_no_such_command_negative_test);
|
|
ATF_TP_ADD_TC(tp, posix_spawnp_enoexec_fallback);
|
|
ATF_TP_ADD_TC(tp, posix_spawnp_enoexec_fallback_null_argv0);
|
|
|
|
return (atf_no_error());
|
|
}
|