From 97a8b4664a442be28f32c269cf909ff1ae95830d Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Tue, 28 Nov 2006 10:28:03 +0000 Subject: Relevant BUGIDs: Purpose of commit: bugfix Commit summary: --------------- 2006-11-28 Thorsten Kukuk * tests/tst-pam_set_data.c: New test cases for pam_set_data(). * tests/Makefile.am: Add pam_set_data test case. * libpam/pam_data.c: Add NULL pointer check for module_data_name. * libpam/Makefile.am: Bump revision of shared library. --- libpam/Makefile.am | 2 +- libpam/pam_data.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 47 insertions(+), 6 deletions(-) (limited to 'libpam') diff --git a/libpam/Makefile.am b/libpam/Makefile.am index 3c816936..8c603efe 100644 --- a/libpam/Makefile.am +++ b/libpam/Makefile.am @@ -20,7 +20,7 @@ include_HEADERS = $(addprefix include/security/, _pam_compat.h _pam_macros.h _pa noinst_HEADERS = pam_prelude.h pam_private.h pam_tokens.h \ pam_modutil_private.h pam_static_modules.h -libpam_la_LDFLAGS = -no-undefined -version-info 81:5:81 @LIBAUDIT@ +libpam_la_LDFLAGS = -no-undefined -version-info 81:6:81 @LIBAUDIT@ if STATIC_MODULES libpam_la_LDFLAGS += `ls ../modules/pam_*/*.lo` \ @LIBDB@ @LIBCRYPT@ @LIBNSL@ @LIBCRACK@ -lutil diff --git a/libpam/pam_data.c b/libpam/pam_data.c index 28b3680d..30570afb 100644 --- a/libpam/pam_data.c +++ b/libpam/pam_data.c @@ -1,9 +1,38 @@ -/* pam_data.c */ - /* - * $Id$ + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, and the entire permission notice in its entirety, + * including the disclaimer of warranties. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior + * written permission. + * + * ALTERNATIVELY, this product may be distributed under the terms of + * the GNU Public License, in which case the provisions of the GPL are + * required INSTEAD OF the above restrictions. (This clause is + * necessary due to a potential bad interaction between the GPL and + * the restrictions contained in a BSD-style copyright.) + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "config.h" + #include "pam_private.h" #include @@ -19,7 +48,7 @@ static struct pam_data *_pam_locate_data(const pam_handle_t *pamh, IF_NO_PAMH("_pam_locate_data", pamh, NULL); data = pamh->data; - + while (data) { if (!strcmp(data->name, name)) { return data; @@ -37,7 +66,7 @@ int pam_set_data( void (*cleanup)(pam_handle_t *pamh, void *data, int error_status)) { struct pam_data *data_entry; - + D(("called")); IF_NO_PAMH("pam_set_data", pamh, PAM_SYSTEM_ERR); @@ -47,6 +76,12 @@ int pam_set_data( return PAM_SYSTEM_ERR; } + /* module_data_name should not be NULL */ + if (module_data_name == NULL) { + D(("called with NULL as module_data_name")); + return PAM_SYSTEM_ERR; + } + /* first check if there is some data already. If so clean it up */ if ((data_entry = _pam_locate_data(pamh, module_data_name))) { @@ -94,6 +129,12 @@ int pam_get_data( return PAM_SYSTEM_ERR; } + /* module_data_name should not be NULL */ + if (module_data_name == NULL) { + D(("called with NULL as module_data_name")); + return PAM_SYSTEM_ERR; + } + data = _pam_locate_data(pamh, module_data_name); if (data) { *datap = data->data; -- cgit v1.2.3