d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pam_exec: fix segfault when authtok is null

Browse Source 
According to pam_exec(8), the `expose_authtok` option should be ignored
when the service function is `pam_sm_setcred`. Currently `pam_exec` only
prevent prompt for anth token when `expose_authtok` is set on
`pam_sm_setcred`. This subsequently led to segfault when there isn't an
existing auth token available.

Bug reported on this: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=263893

After reading https://reviews.freebsd.org/rS349556 I am not sure if the
default behaviour supposed to be simply not prompt for authentication
token, or is it to ignore the option entirely as stated in the man page.

This patch is therefore only adding an additional NULL check on the item
`pam_get_item` provide, and exit with `PAM_SYSTEM_ERR` when such item is
NULL.

MFC after:	1 week
Reviewed by:	des, khng
Differential Revision:	https://reviews.freebsd.org/D35169
This commit is contained in:
Yan Ka Chiu 2022-05-22 12:33:02 -04:00 committed by Ka Ho Ng
parent 2986638550
commit b75e0eed34
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libpam/modules/pam_exec/pam_exec.c
View File

@ -261,6 +261,13 @@ _pam_exec(pam_handle_t *pamh,
/* don't prompt, only expose existing token */
rc = pam_get_item(pamh, PAM_AUTHTOK, &item);
authtok = item;
if (authtok == NULL && rc == PAM_SUCCESS) {
openpam_log(PAM_LOG_ERROR,
"%s: pam_get_authtok(): %s",
func, "authentication token not available");
OUT(PAM_SYSTEM_ERR);
}
} else {
rc = pam_get_authtok(pamh, PAM_AUTHTOK, &authtok, NULL);
}