summaryrefslogtreecommitdiff
path: root/modules/pam_tally
diff options
context:
space:
mode:
authorTomas Mraz <tm@t8m.info>2005-04-04 09:46:10 +0000
committerTomas Mraz <tm@t8m.info>2005-04-04 09:46:10 +0000
commit8ebbc8468fb42237a36f8aaba2434f72ec152ef5 (patch)
treee522313dbcbb51cbd95ee69ce49146d90a449252 /modules/pam_tally
parente4e09b54f0a953e781ee5ba21ce33fde4b20ab63 (diff)
Relevant BUGIDs:
Purpose of commit: bugfix Commit summary: --------------- Test for NULL data before dereferencing them
Diffstat (limited to 'modules/pam_tally')
-rw-r--r--modules/pam_tally/pam_tally.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/pam_tally/pam_tally.c b/modules/pam_tally/pam_tally.c
index 57fa611a..2ea38810 100644
--- a/modules/pam_tally/pam_tally.c
+++ b/modules/pam_tally/pam_tally.c
@@ -268,7 +268,7 @@ static int tally_get_data( pam_handle_t *pamh, time_t *oldtime )
const void *data;
rv = pam_get_data(pamh, MODULE_NAME, &data);
- if ( rv == PAM_SUCCESS && oldtime != NULL ) {
+ if ( rv == PAM_SUCCESS && data != NULL && oldtime != NULL ) {
*oldtime = *(const time_t *)data;
pam_set_data(pamh, MODULE_NAME, NULL, NULL);
}
@@ -423,6 +423,7 @@ static int tally_bump (int inc, time_t *oldtime,
int i;
i=get_tally( &tally, uid, opts->filename, &TALLY, fsp );
+ if ( i != PAM_SUCCESS ) { if (TALLY) fclose(TALLY); RETURN_ERROR( i ); }
/* to remember old fail time (for locktime) */
fsp->fs_fail_time = fsp->fs_faillog.fail_time;
@@ -455,7 +456,6 @@ static int tally_bump (int inc, time_t *oldtime,
(size_t)sizeof(fsp->fs_faillog.fail_line));
fsp->fs_faillog.fail_line[sizeof(fsp->fs_faillog.fail_line)-1] = 0;
}
- if ( i != PAM_SUCCESS ) { if (TALLY) fclose(TALLY); RETURN_ERROR( i ); }
if ( !(opts->ctrl & OPT_MAGIC_ROOT) || getuid() ) { /* magic_root doesn't change tally */