dcavalca / rpms / util-linux

Forked from rpms/util-linux 2 years ago
Clone

Blame SOURCES/0005-Complete-Linux-PAM-compliance-for-forked-child-in-su.patch

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