From 333ce73d6abbf8683558547a728f7088acd3b342 Mon Sep 17 00:00:00 2001 From: des Date: Mon, 22 Mar 2010 11:00:57 +0000 Subject: Merge upstream r432: pam_end() already contains a NULL check, and it is not unreasonable to call it with a NULL pamh in a cleanup / error-handling situation. Remove OPENPAM_NONNULL, which may cause gcc to optimize away the NULL check. This fixes a potential NULL pointer dereference in error-handling code in passwd(1). --- contrib/openpam/include/security/pam_appl.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'contrib') diff --git a/contrib/openpam/include/security/pam_appl.h b/contrib/openpam/include/security/pam_appl.h index 8316c68..131c2f9 100644 --- a/contrib/openpam/include/security/pam_appl.h +++ b/contrib/openpam/include/security/pam_appl.h @@ -72,8 +72,7 @@ pam_close_session(pam_handle_t *_pamh, int pam_end(pam_handle_t *_pamh, - int _status) - OPENPAM_NONNULL((1)); + int _status); int pam_get_data(const pam_handle_t *_pamh, -- cgit v1.1