Author: des Date: Mon Mar 22 11:00:57 2010 New Revision: 205441 URL: http://svn.freebsd.org/changeset/base/205441
Log: 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). Modified: head/contrib/openpam/include/security/pam_appl.h Directory Properties: head/contrib/openpam/ (props changed) Modified: head/contrib/openpam/include/security/pam_appl.h ============================================================================== --- head/contrib/openpam/include/security/pam_appl.h Mon Mar 22 10:58:16 2010 (r205440) +++ head/contrib/openpam/include/security/pam_appl.h Mon Mar 22 11:00:57 2010 (r205441) @@ -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, _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
