|
 |
8ea3d3 |
From 1fd7a5ecb46a02a29ebf42039575b5344307bfbb Mon Sep 17 00:00:00 2001
|
|
|
8ea3d3 |
From: Alexey Tikhonov <atikhono@redhat.com>
|
|
|
8ea3d3 |
Date: Wed, 8 Feb 2023 18:58:37 +0100
|
|
|
8ea3d3 |
Subject: [PATCH 4/4] PAM_SSS: close(sss_cli_sd) should also be protected with
|
|
|
8ea3d3 |
mutex. Otherwise a thread calling pam_end() can close socket mid pam
|
|
|
8ea3d3 |
transaction in another thread.
|
|
|
8ea3d3 |
MIME-Version: 1.0
|
|
|
8ea3d3 |
Content-Type: text/plain; charset=UTF-8
|
|
|
8ea3d3 |
Content-Transfer-Encoding: 8bit
|
|
|
8ea3d3 |
|
|
|
8ea3d3 |
Bug only manifested on platforms where "lockfree client"
|
|
|
8ea3d3 |
feature wasn't built.
|
|
|
8ea3d3 |
|
|
|
8ea3d3 |
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
|
|
|
8ea3d3 |
Reviewed-by: Sumit Bose <sbose@redhat.com>
|
|
|
8ea3d3 |
(cherry picked from commit bf3f73ea0ee123fe4e7c4bdd2287ac5a5e6d9082)
|
|
|
8ea3d3 |
---
|
|
|
8ea3d3 |
src/sss_client/pam_sss.c | 3 +++
|
|
|
8ea3d3 |
src/sss_client/pam_sss_gss.c | 2 ++
|
|
|
8ea3d3 |
2 files changed, 5 insertions(+)
|
|
|
8ea3d3 |
|
|
|
8ea3d3 |
diff --git a/src/sss_client/pam_sss.c b/src/sss_client/pam_sss.c
|
|
|
8ea3d3 |
index afbdef59a..39ad17188 100644
|
|
|
8ea3d3 |
--- a/src/sss_client/pam_sss.c
|
|
|
8ea3d3 |
+++ b/src/sss_client/pam_sss.c
|
|
|
8ea3d3 |
@@ -117,7 +117,10 @@ static void close_fd(pam_handle_t *pamh, void *ptr, int err)
|
|
|
8ea3d3 |
#endif /* PAM_DATA_REPLACE */
|
|
|
8ea3d3 |
|
|
|
8ea3d3 |
D(("Closing the fd"));
|
|
|
8ea3d3 |
+
|
|
|
8ea3d3 |
+ sss_pam_lock();
|
|
|
8ea3d3 |
sss_cli_close_socket();
|
|
|
8ea3d3 |
+ sss_pam_unlock();
|
|
|
8ea3d3 |
}
|
|
|
8ea3d3 |
|
|
|
8ea3d3 |
struct cert_auth_info {
|
|
|
8ea3d3 |
diff --git a/src/sss_client/pam_sss_gss.c b/src/sss_client/pam_sss_gss.c
|
|
|
8ea3d3 |
index 1109ec570..dd578ae5d 100644
|
|
|
8ea3d3 |
--- a/src/sss_client/pam_sss_gss.c
|
|
|
8ea3d3 |
+++ b/src/sss_client/pam_sss_gss.c
|
|
|
8ea3d3 |
@@ -581,7 +581,9 @@ int pam_sm_authenticate(pam_handle_t *pamh,
|
|
|
8ea3d3 |
}
|
|
|
8ea3d3 |
|
|
|
8ea3d3 |
done:
|
|
|
8ea3d3 |
+ sss_pam_lock();
|
|
|
8ea3d3 |
sss_cli_close_socket();
|
|
|
8ea3d3 |
+ sss_pam_unlock();
|
|
|
8ea3d3 |
free(username);
|
|
|
8ea3d3 |
free(domain);
|
|
|
8ea3d3 |
free(target);
|
|
|
8ea3d3 |
--
|
|
|
8ea3d3 |
2.37.3
|
|
|
8ea3d3 |
|