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

sudo_edit() must return a wait status but if there is an error, or

Browse Source 
even if no changes were made to the file, it was returning 1 instead
which would be interpreted as the command having received SIGHUP.
Use the W_EXITCODE() to construct a proper wait status in the error
case too.
This commit is contained in:
Todd C. Miller
2017-06-05 07:11:09 -06:00
parent 26d9043bf4
commit 0d70e868f1
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/sudo_edit.c
View File

@@ -932,7 +932,8 @@ selinux_edit_copy_tfiles(struct command_details *command_details,
/* /*
* Wrapper to allow users to edit privileged files with their own uid. * Wrapper to allow users to edit privileged files with their own uid.
* Returns 0 on success and 1 on failure. * Returns the wait status of the command on success and a wait status
* of 1 on failure.
*/ */
int int
sudo_edit(struct command_details *command_details) sudo_edit(struct command_details *command_details)
@@ -1046,12 +1047,14 @@ sudo_edit(struct command_details *command_details)
else else
#endif #endif
errors = sudo_edit_copy_tfiles(command_details, tf, nfiles, times); errors = sudo_edit_copy_tfiles(command_details, tf, nfiles, times);
if (errors)
goto cleanup;
for (i = 0; i < nfiles; i++) for (i = 0; i < nfiles; i++)
free(tf[i].tfile); free(tf[i].tfile);
free(tf); free(tf);
free(nargv); free(nargv);
debug_return_int(errors ? 1 : rc); debug_return_int(rc);
cleanup: cleanup:
/* Clean up temp files and return. */ /* Clean up temp files and return. */
@@ -1063,7 +1066,7 @@ cleanup:
} }
free(tf); free(tf);
free(nargv); free(nargv);
debug_return_int(1); debug_return_int(W_EXITCODE(1, 0));
} }
#else /* HAVE_SETRESUID || HAVE_SETREUID || HAVE_SETEUID */ #else /* HAVE_SETRESUID || HAVE_SETREUID || HAVE_SETEUID */
@@ -1075,7 +1078,7 @@ int
sudo_edit(struct command_details *command_details) sudo_edit(struct command_details *command_details)
{ {
debug_decl(sudo_edit, SUDO_DEBUG_EDIT) debug_decl(sudo_edit, SUDO_DEBUG_EDIT)
debug_return_int(1); debug_return_int(W_EXITCODE(1, 0));
} }
#endif /* HAVE_SETRESUID || HAVE_SETREUID || HAVE_SETEUID */ #endif /* HAVE_SETRESUID || HAVE_SETREUID || HAVE_SETEUID */