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

Fix restoring the file context of the user's tty with SELinux.

Browse Source 
Also fix broken tty labeling when running a command in a pty.
Includes a fix for a typo introduced in the last change set.
This commit is contained in:
Todd C. Miller
2019-09-27 15:32:49 -06:00
parent b7b3fb72d0
commit 112dff276a
7 changed files with 50 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/exec.c
View File

@@ -106,19 +106,11 @@ restore_nproc(void)
* Returns true on success and false on failure.
*/
static bool
exec_setup(struct command_details *details, const char *ptyname, int ptyfd)
exec_setup(struct command_details *details)
{
bool ret = false;
debug_decl(exec_setup, SUDO_DEBUG_EXEC)
#ifdef HAVE_SELINUX
if (ISSET(details->flags, CD_RBAC_ENABLED)) {
if (selinux_setup(details->selinux_role, details->selinux_type,
ptyname ? ptyname : user_details.tty, ptyfd) == -1)
goto done;
}
#endif
if (details->pw != NULL) {
#ifdef HAVE_PROJECT_H
set_project(details->pw);
@@ -144,7 +136,7 @@ exec_setup(struct command_details *details, const char *ptyname, int ptyfd)
#endif /* HAVE_PRIV_SET */
#ifdef HAVE_GETUSERATTR
if (aix_prep_user(details->pw->pw_name, ptyname ? ptyname : user_details.tty) != 0) {
if (aix_prep_user(details->pw->pw_name, details->tty) != 0) {
/* error message displayed by aix_prep_user */
goto done;
}
@@ -265,7 +257,7 @@ exec_cmnd(struct command_details *details, int errfd)
debug_decl(exec_cmnd, SUDO_DEBUG_EXEC)
restore_signals();
if (exec_setup(details, NULL, -1) == true) {
if (exec_setup(details) == true) {
/* headed for execve() */
if (details->closefrom >= 0) {
int fd, maxfd;