Skip to content

Fix PAM session termination in child process to support deferred pam_cap operations #414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wngtk wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix PAM session termination in child process to support deferred pam_cap operations #414

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions src/session-child.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,14 +656,14 @@ session_child_run (int argc, char **argv)
if (setsid () < 0)
_exit (errno);

extern char **environ;
environ = pam_getenvlist (pam_handle);
#if HAVE_SETUSERCONTEXT
/* Setup user context
* Reset the current environment to what is in the PAM context,
* then setusercontext will add to it as necessary as there is no
* option for setusercontext to add to a PAM context.
*/
extern char **environ;
environ = pam_getenvlist (pam_handle);
struct passwd* pwd = getpwnam (username);
if (pwd) {
if (setusercontext (NULL, pwd, pwd->pw_uid, LOGIN_SETALL) < 0) {
Expand Down Expand Up @@ -711,14 +711,12 @@ session_child_run (int argc, char **argv)
/* Reset SIGPIPE handler so the child has default behaviour (we disabled it at LightDM start) */
signal (SIGPIPE, SIG_DFL);

/* End PAM session with DATA_SILENT
* To notify PAM modules (e.g. pam_cap) of transaction termination */
(void) pam_end(pam_handle, PAM_SUCCESS | PAM_DATA_SILENT);

/* Run the command */
execve (command_argv[0], command_argv,
#if HAVE_SETUSERCONTEXT
environ
#else
pam_getenvlist (pam_handle)
#endif
);
execve (command_argv[0], command_argv, environ);
_exit (EXIT_FAILURE);
}

Expand Down