picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

shared/exec-util: fall back to execve() also on permission errors

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-10-14 17:24:24 +02:00
parent f98ca3a11d
commit 3f51bbff55
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/shared/exec-util.c
View File

@ -11,6 +11,7 @@
#include "conf-files.h"
#include "env-file.h"
#include "env-util.h"
#include "errno-util.h"
#include "exec-util.h"
#include "fd-util.h"
#include "fileio.h"
@ -447,8 +448,9 @@ ExecCommandFlags exec_command_flags_from_string(const char *s) {
int fexecve_or_execve(int executable_fd, const char *executable, char *const argv[], char *const envp[]) {
execveat(executable_fd, "", argv, envp, AT_EMPTY_PATH);
if (IN_SET(errno, ENOSYS, ENOENT))
/* Old kernel or a script? Let's fall back to execve().
if (IN_SET(errno, ENOSYS, ENOENT) || ERRNO_IS_PRIVILEGE(errno))
/* Old kernel or a script or an overzealous seccomp filter? Let's fall back to execve().
*
* fexecve(3): "If fd refers to a script (i.e., it is an executable text file that names a
* script interpreter with a first line that begins with the characters #!) and the