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

Restore the NULL check that was removed in upstream r913. It is not

Browse Source 
unreasonable to call pam_end() with a NULL pamh in error handling code.

Reported by:	rwatson
This commit is contained in:
Dag-Erling Smørgrav 2017-03-24 14:45:58 +00:00
parent 7e31684ea4
commit e4deb071bd
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/openpam/include/security/pam_appl.h
View File

@ -72,8 +72,7 @@ pam_close_session(pam_handle_t *_pamh,
int int
pam_end(pam_handle_t *_pamh, pam_end(pam_handle_t *_pamh,
int _status) int _status);
OPENPAM_NONNULL((1));
int int
pam_get_data(const pam_handle_t *_pamh, pam_get_data(const pam_handle_t *_pamh,

2
contrib/openpam/lib/libpam/pam_end.c
View File

@ -60,6 +60,8 @@ pam_end(pam_handle_t *pamh,
int i; int i;
ENTER(); ENTER();
if (pamh == NULL)
RETURNC(PAM_SYSTEM_ERR);
/* clear module data */ /* clear module data */
while ((dp = pamh->module_data) != NULL) { while ((dp = pamh->module_data) != NULL) {