diff options
| author | Benny Baumann <BenBE@geshi.org> | 2023-11-12 20:36:05 +0100 |
|---|---|---|
| committer | Dmitry V. Levin <github.dl@altlinux.org> | 2023-11-15 20:31:19 +0000 |
| commit | 6619819487f9da20a0e6f70aaa92c422d1e6f124 (patch) | |
| tree | 1a21e48d1877a621de3d45fb4031d57de2b5088f /libpam | |
| parent | 38c0bd5a65d133a30381bd8a5cb16c2ff2d15065 (diff) | |
| download | pam-6619819487f9da20a0e6f70aaa92c422d1e6f124.tar.gz pam-6619819487f9da20a0e6f70aaa92c422d1e6f124.tar.bz2 pam-6619819487f9da20a0e6f70aaa92c422d1e6f124.zip | |
libpam: Simplify mod_path string building logic
This is much easier to read, does the same and is less prone
to getting memcpy and strcpy wrong.
Signed-off-by: Benny Baumann <BenBE@geshi.org>
Diffstat (limited to 'libpam')
| -rw-r--r-- | libpam/pam_handlers.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/libpam/pam_handlers.c b/libpam/pam_handlers.c index 08930386..bb6268b3 100644 --- a/libpam/pam_handlers.c +++ b/libpam/pam_handlers.c @@ -9,6 +9,7 @@ #include "pam_private.h" #include "pam_inline.h" +#include <limits.h> #include <stdlib.h> #include <stdio.h> #include <string.h> @@ -734,23 +735,14 @@ _pam_load_module(pam_handle_t *pamh, const char *mod_path, int handler_type) size_t isa_len = strlen("$ISA"); if (isa != NULL) { - size_t pam_isa_len = strlen(_PAM_ISA); - char *mod_full_isa_path = - malloc(strlen(mod_path) - isa_len + pam_isa_len + 1); - - if (mod_full_isa_path == NULL) { + char *mod_full_isa_path = NULL; + if (strlen(mod_path) >= INT_MAX || + asprintf(&mod_full_isa_path, "%.*s%s%s", + (int)(isa - mod_path), mod_path, _PAM_ISA, isa + isa_len) < 0) { D(("couldn't get memory for mod_path")); pam_syslog(pamh, LOG_CRIT, "no memory for module path"); success = PAM_ABORT; } else { - char *p = mod_full_isa_path; - - memcpy(p, mod_path, isa - mod_path); - p += isa - mod_path; - memcpy(p, _PAM_ISA, pam_isa_len); - p += pam_isa_len; - strcpy(p, isa + isa_len); - mod->dl_handle = _pam_dlopen(mod_full_isa_path); _pam_drop(mod_full_isa_path); } |