diff options
| author | des <des@FreeBSD.org> | 2010-03-22 11:00:57 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2010-03-22 11:00:57 +0000 |
| commit | 333ce73d6abbf8683558547a728f7088acd3b342 (patch) | |
| tree | 91345ff9c8439be9d270faf545e1ecc99f4fa622 /contrib | |
| parent | a52af8cfd6b7cd34e34ab9dd42b772901300bf9a (diff) | |
| download | FreeBSD-src-333ce73d6abbf8683558547a728f7088acd3b342.zip FreeBSD-src-333ce73d6abbf8683558547a728f7088acd3b342.tar.gz | |
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).
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/openpam/include/security/pam_appl.h | 3 |
1 files changed, 1 insertions, 2 deletions
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, |
