mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 07:10:06 +00:00
74630b1bb7
If the pidfd_spawn/pidfd_spawnp helper process succeeds, but evecve
fails for some reason (either with an invalid/non-existent, memory
allocation, etc.) the resulting pidfd is never closed, nor returned
to caller (so it can call close).
Since the process creation failed, it should be up to posix_spawn to
also, close the file descriptor in this case (similar to what it
does to reap the process).
This patch also changes the waitpid with waitid (P_PIDFD) for pidfd
case, to avoid a possible pid re-use.
Checked on x86_64-linux-gnu.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
(cherry picked from commit c90cfce849)
94 lines
2.7 KiB
C
94 lines
2.7 KiB
C
/* Further tests for spawn in case of invalid binary paths.
|
|
Copyright (C) 2016-2024 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
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#include <spawn.h>
|
|
#include <error.h>
|
|
#include <errno.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/wait.h>
|
|
#include <stdio.h>
|
|
|
|
#include <support/check.h>
|
|
#include <support/descriptors.h>
|
|
#include <tst-spawn.h>
|
|
|
|
int
|
|
do_test (void)
|
|
{
|
|
/* Check if posix_spawn correctly returns an error and an invalid pid
|
|
by trying to spawn an invalid binary. */
|
|
|
|
const char *program = "/path/to/invalid/binary";
|
|
char * const args[] = { 0 };
|
|
PID_T_TYPE pid = -1;
|
|
|
|
{
|
|
struct support_descriptors *descrs = support_descriptors_list ();
|
|
|
|
int ret = POSIX_SPAWN (&pid, program, 0, 0, args, environ);
|
|
if (ret != ENOENT)
|
|
{
|
|
errno = ret;
|
|
FAIL_EXIT1 ("posix_spawn: %m");
|
|
}
|
|
|
|
/* POSIX states the value returned on pid variable in case of an error
|
|
is not specified. GLIBC will update the value iff the child
|
|
execution is successful. */
|
|
if (pid != -1)
|
|
FAIL_EXIT1 ("posix_spawn returned pid != -1 (%i)", (int) pid);
|
|
|
|
/* Check if no child is actually created. */
|
|
TEST_COMPARE (WAITID (P_ALL, 0, NULL, WEXITED), -1);
|
|
TEST_COMPARE (errno, ECHILD);
|
|
|
|
/* Also check if there is no leak descriptors. */
|
|
support_descriptors_check (descrs);
|
|
support_descriptors_free (descrs);
|
|
}
|
|
|
|
{
|
|
/* Same as before, but with posix_spawnp. */
|
|
char *args2[] = { (char*) program, 0 };
|
|
|
|
struct support_descriptors *descrs = support_descriptors_list ();
|
|
|
|
int ret = POSIX_SPAWNP (&pid, args2[0], 0, 0, args2, environ);
|
|
if (ret != ENOENT)
|
|
{
|
|
errno = ret;
|
|
FAIL_EXIT1 ("posix_spawnp: %m");
|
|
}
|
|
|
|
if (pid != -1)
|
|
FAIL_EXIT1 ("posix_spawnp returned pid != -1 (%i)", (int) pid);
|
|
|
|
TEST_COMPARE (WAITID (P_ALL, 0, NULL, WEXITED), -1);
|
|
TEST_COMPARE (errno, ECHILD);
|
|
|
|
support_descriptors_check (descrs);
|
|
support_descriptors_free (descrs);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
#include <support/test-driver.c>
|