67 lines
2.5 KiB
Diff
67 lines
2.5 KiB
Diff
|
From 76fe6ebee84c22c96f1c9a96707c7e72706989fd Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mauri de Souza Meneguzzo <mauri870@gmail.com>
|
||
|
|
Date: Mon, 24 Jun 2024 23:47:15 -0300
|
||
|
|
Subject: [PATCH] shared: log error when execve fail
|
||
|
|
|
||
|
|
If there is an error with the execv call in fork_agent the
|
||
|
|
program exits without any meaningful log message. Log the
|
||
|
|
command and errno so the user gets more information about
|
||
|
|
the failure.
|
||
|
|
|
||
|
|
Fixes: #33418
|
||
|
|
|
||
|
|
Signed-off-by: Mauri de Souza Meneguzzo <mauri870@gmail.com>
|
||
|
|
(cherry picked from commit a408d4453145621902b9a3ef78a552f83b09bd8d)
|
||
|
|
(cherry picked from commit 7fcfb73d71ed1d4230f58de1a94790e0c28719ea)
|
||
|
|
|
||
|
|
Conflict:NA
|
||
|
|
Reference:https://github.com/systemd/systemd-stable/commit/76fe6ebee84c22c96f1c9a96707c7e72706989fd
|
||
|
|
---
|
||
|
|
src/shared/exec-util.c | 1 +
|
||
|
|
src/shared/spawn-polkit-agent.c | 11 ++++++++---
|
||
|
|
2 files changed, 9 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/shared/exec-util.c b/src/shared/exec-util.c
|
||
|
|
index c27f3a54c1..b402877d4d 100644
|
||
|
|
--- a/src/shared/exec-util.c
|
||
|
|
+++ b/src/shared/exec-util.c
|
||
|
|
@@ -601,5 +601,6 @@ int fork_agent(const char *name, const int except[], size_t n_except, pid_t *ret
|
||
|
|
va_end(ap);
|
||
|
|
|
||
|
|
execv(path, l);
|
||
|
|
+ log_error_errno(errno, "Failed to execute %s: %m", path);
|
||
|
|
_exit(EXIT_FAILURE);
|
||
|
|
}
|
||
|
|
diff --git a/src/shared/spawn-polkit-agent.c b/src/shared/spawn-polkit-agent.c
|
||
|
|
index ce3c5fb948..fd91bd636f 100644
|
||
|
|
--- a/src/shared/spawn-polkit-agent.c
|
||
|
|
+++ b/src/shared/spawn-polkit-agent.c
|
||
|
|
@@ -43,16 +43,21 @@ int polkit_agent_open(void) {
|
||
|
|
xsprintf(notify_fd, "%i", pipe_fd[1]);
|
||
|
|
|
||
|
|
r = fork_agent("(polkit-agent)",
|
||
|
|
- &pipe_fd[1], 1,
|
||
|
|
+ &pipe_fd[1],
|
||
|
|
+ 1,
|
||
|
|
&agent_pid,
|
||
|
|
POLKIT_AGENT_BINARY_PATH,
|
||
|
|
- POLKIT_AGENT_BINARY_PATH, "--notify-fd", notify_fd, "--fallback", NULL);
|
||
|
|
+ POLKIT_AGENT_BINARY_PATH,
|
||
|
|
+ "--notify-fd",
|
||
|
|
+ notify_fd,
|
||
|
|
+ "--fallback",
|
||
|
|
+ NULL);
|
||
|
|
|
||
|
|
/* Close the writing side, because that's the one for the agent */
|
||
|
|
safe_close(pipe_fd[1]);
|
||
|
|
|
||
|
|
if (r < 0)
|
||
|
|
- log_error_errno(r, "Failed to fork TTY ask password agent: %m");
|
||
|
|
+ log_error_errno(r, "Failed to fork polkit agent: %m");
|
||
|
|
else
|
||
|
|
/* Wait until the agent closes the fd */
|
||
|
|
(void) fd_wait_for_event(pipe_fd[0], POLLHUP, USEC_INFINITY);
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|