isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use W_EXITCODE to construct the wait status if sudo could not execute

Browse Source 
the command.  Fixes the sudo exit value for exec(3) failure.
This commit is contained in:
Todd C. Miller
2016-08-31 08:39:26 -06:00
parent a9570e64ff
commit e147ba1fec
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/sudo_compat.h
View File

@@ -284,6 +284,11 @@ extern int errno;
# define WCOREDUMP(x) ((x) & 0x80) # define WCOREDUMP(x) ((x) & 0x80)
#endif #endif
/* W_EXITCODE is not POSIX but the encoding of wait status is. */
#ifndef W_EXITCODE
# define W_EXITCODE(ret, sig) ((ret) << 8 | (sig))
#endif
/* Number of bits in a byte. */ /* Number of bits in a byte. */
#ifndef NBBY #ifndef NBBY
# ifdef __NBBY # ifdef __NBBY

4
src/sudo.c
View File

@@ -1130,13 +1130,14 @@ done:
/* /*
* Run the command and wait for it to complete. * Run the command and wait for it to complete.
* Returns wait status suitable for use with the wait(2) macros.
*/ */
int int
run_command(struct command_details *details) run_command(struct command_details *details)
{ {
struct plugin_container *plugin; struct plugin_container *plugin;
struct command_status cstat; struct command_status cstat;
int status = 1; int status = W_EXITCODE(1, 0);
debug_decl(run_command, SUDO_DEBUG_EXEC) debug_decl(run_command, SUDO_DEBUG_EXEC)
cstat.type = CMD_INVALID; cstat.type = CMD_INVALID;
@@ -1155,7 +1156,6 @@ run_command(struct command_details *details)
"calling I/O close with errno %d", cstat.val); "calling I/O close with errno %d", cstat.val);
iolog_close(plugin, 0, cstat.val); iolog_close(plugin, 0, cstat.val);
} }
status = 1;
break; break;
case CMD_WSTATUS: case CMD_WSTATUS:
/* Command ran, exited or was killed. */ /* Command ran, exited or was killed. */