673c78
From 41ae35c39241575c63db204c786cb1423c202815 Mon Sep 17 00:00:00 2001
673c78
From: "Andrew G. Morgan" <morgan@kernel.org>
673c78
Date: Sat, 27 Nov 2021 21:00:22 -0800
673c78
Subject: Complete Linux-PAM compliance for forked child in su and login.
673c78
673c78
As documented here:
673c78
673c78
http://www.linux-pam.org/Linux-PAM-html/adg-interface-by-app-expected.html#adg-pam_end
673c78
673c78
The child that is about to exec*() the user shell is supposed to pam_end()
673c78
with PAM_DATA_SILENT. This gives the modules a last chance to do a minor
673c78
cleanup of the module state before the user's shell is launched.
673c78
673c78
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2037212
673c78
Upstream: http://github.com/util-linux/util-linux/commit/4660286e9cdff6d95b49295674b96f83af10ea36
673c78
Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
673c78
---
673c78
 login-utils/login.c     | 3 +++
673c78
 login-utils/su-common.c | 3 +++
673c78
 2 files changed, 6 insertions(+)
673c78
673c78
diff --git a/login-utils/login.c b/login-utils/login.c
673c78
index 3657f04cd..c62e91e94 100644
673c78
--- a/login-utils/login.c
673c78
+++ b/login-utils/login.c
673c78
@@ -1521,6 +1521,9 @@ int main(int argc, char **argv)
673c78
 
673c78
 	child_argv[child_argc++] = NULL;
673c78
 
673c78
+	/* http://www.linux-pam.org/Linux-PAM-html/adg-interface-by-app-expected.html#adg-pam_end */
673c78
+	(void) pam_end(cxt.pamh, PAM_SUCCESS|PAM_DATA_SILENT);
673c78
+
673c78
 	execvp(child_argv[0], child_argv + 1);
673c78
 
673c78
 	if (!strcmp(child_argv[0], "/bin/sh"))
673c78
diff --git a/login-utils/su-common.c b/login-utils/su-common.c
673c78
index afd0ea8ad..7d4826bbc 100644
673c78
--- a/login-utils/su-common.c
673c78
+++ b/login-utils/su-common.c
673c78
@@ -1231,6 +1231,9 @@ int su_main(int argc, char **argv, int mode)
673c78
 	if (su->simulate_login && chdir(su->pwd->pw_dir) != 0)
673c78
 		warn(_("warning: cannot change directory to %s"), su->pwd->pw_dir);
673c78
 
673c78
+	/* http://www.linux-pam.org/Linux-PAM-html/adg-interface-by-app-expected.html#adg-pam_end */
673c78
+	(void) pam_end(su->pamh, PAM_SUCCESS|PAM_DATA_SILENT);
673c78
+
673c78
 	if (shell)
673c78
 		run_shell(su, shell, command, argv + optind, max(0, argc - optind));
673c78
 
673c78
-- 
673c78
2.34.1
673c78