Date: Mon, 22 Mar 2010 11:00:57 +0000 (UTC) From: Dag-Erling Smorgrav <des@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r205441 - head/contrib/openpam/include/security Message-ID: <201003221100.o2MB0vjM001165@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003221100.o2MB0vjM001165>