From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 1 Feb 2022 11:37:51 +0000 (+0100)
Subject: pid1: pass PAM_DATA_SILENT to pam_end() in child
X-Git-Tag: v251-rc1~392^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7feb2b5737ad110eb3985e8e9d8189f18d1c5147;p=thirdparty%2Fsystemd.git

pid1: pass PAM_DATA_SILENT to pam_end() in child

Fixes: #22318
---

diff --git a/src/core/execute.c b/src/core/execute.c
index f2b58303df0..be2116e0eca 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -1343,7 +1343,9 @@ static int setup_pam(
                 ret = 0;
 
         child_finish:
-                pam_end(handle, pam_code | flags);
+                /* NB: pam_end() when called in child processes should set PAM_DATA_SILENT to let the module
+                 * know about this. See pam_end(3) */
+                (void) pam_end(handle, pam_code | flags | PAM_DATA_SILENT);
                 _exit(ret);
         }
 
@@ -1378,7 +1380,7 @@ fail:
                 if (close_session)
                         pam_code = pam_close_session(handle, flags);
 
-                pam_end(handle, pam_code | flags);
+                (void) pam_end(handle, pam_code | flags);
         }
 
         strv_free(e);