From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH] misc-progs: setuid: Return exit code from called process Date: Wed, 24 May 2023 09:08:41 +0000 Message-ID: <20230524090841.269580-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8427008602103454577==" List-Id: --===============8427008602103454577== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This patch will return the exit code from the called process which has not been done before. This made it more difficult to catch any unsuccessful calls from the web UI. Partly Fixes: #12863 Tested-by: Jon Murphy Signed-off-by: Michael Tremer --- src/misc-progs/setuid.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/misc-progs/setuid.c b/src/misc-progs/setuid.c index 17b0e7066..9dc0a767b 100644 --- a/src/misc-progs/setuid.c +++ b/src/misc-progs/setuid.c @@ -104,16 +104,20 @@ static int system_core(char* command, char** args, uid_= t uid, gid_t gid, char *e } =20 default: /* parent */ - do { - if (waitpid(pid, &status, 0) =3D=3D -1) { - if (errno !=3D EINTR) - return -1; - } else { - return status; - } - } while (1); - } + // Wait until the child process has finished + waitpid(pid, &status, 0); + + // The child was terminated by a signal + if (WIFSIGNALED(status)) + return 128 + WTERMSIG(status); =20 + // Return the exit code if available + if (WIFEXITED(status)) + return WEXITSTATUS(status); + + // Something unexpected happened, exiting with error + return EXIT_FAILURE; + } } =20 int run(char* command, char** argv) { --=20 2.30.2 --===============8427008602103454577==--