mirror of
https://git.kernel.org/pub/scm/network/iproute2/iproute2.git
synced 2026-01-26 22:22:18 +00:00
70ba338cd8
If we forked, returning from the function will make the calling code to continue in both the child and parent process. Make cmd_exec exit if setup failed and it forked already. An example of issues this causes, where a failure in setup causes multiple unnecessary tries: ``` $ ip netns ef ab $ ip -all netns exec ls netns: ef setting the network namespace "ef" failed: Operation not permitted netns: ab setting the network namespace "ab" failed: Operation not permitted netns: ab setting the network namespace "ab" failed: Operation not permitted ``` Signed-off-by: Yedaya Katsman <yedaya.ka@gmail.com> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
52 lines
823 B
C
52 lines
823 B
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#include <sys/wait.h>
|
|
#include <stdio.h>
|
|
#include <errno.h>
|
|
#include <unistd.h>
|
|
|
|
#include "utils.h"
|
|
#include "namespace.h"
|
|
|
|
int cmd_exec(const char *cmd, char **argv, bool do_fork,
|
|
int (*setup)(void *), void *arg)
|
|
{
|
|
fflush(stdout);
|
|
if (do_fork) {
|
|
int status;
|
|
pid_t pid;
|
|
|
|
pid = fork();
|
|
if (pid < 0) {
|
|
perror("fork");
|
|
exit(1);
|
|
}
|
|
|
|
if (pid != 0) {
|
|
/* Parent */
|
|
if (waitpid(pid, &status, 0) < 0) {
|
|
perror("waitpid");
|
|
exit(1);
|
|
}
|
|
|
|
if (WIFEXITED(status)) {
|
|
return WEXITSTATUS(status);
|
|
}
|
|
|
|
exit(1);
|
|
}
|
|
}
|
|
|
|
if (setup && setup(arg)) {
|
|
if (do_fork) {
|
|
/* In child, nothing to do */
|
|
_exit(1);
|
|
}
|
|
return -1;
|
|
}
|
|
|
|
if (execvp(cmd, argv) < 0)
|
|
fprintf(stderr, "exec of \"%s\" failed: %s\n",
|
|
cmd, strerror(errno));
|
|
_exit(1);
|
|
}
|