From 754fd1141940b258d2018c430927e6c9c9c7e869 Mon Sep 17 00:00:00 2001 From: des Date: Tue, 22 Jun 2010 19:56:07 +0000 Subject: [PATCH] merge r196650 from head (via stable/8): tty might be NULL Approved by: re (kib@) git-svn-id: svn://svn.freebsd.org/base/releng/8.1@209441 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- lib/libpam/modules/pam_lastlog/pam_lastlog.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/libpam/modules/pam_lastlog/pam_lastlog.c b/lib/libpam/modules/pam_lastlog/pam_lastlog.c index 817d1f3b..9899f8d1 100644 --- a/lib/libpam/modules/pam_lastlog/pam_lastlog.c +++ b/lib/libpam/modules/pam_lastlog/pam_lastlog.c @@ -183,6 +183,11 @@ pam_sm_close_session(pam_handle_t *pamh __unused, int flags __unused, pam_err = pam_get_item(pamh, PAM_TTY, (const void **)&tty); if (pam_err != PAM_SUCCESS) goto err; + if (tty == NULL) { + PAM_LOG("No PAM_TTY"); + pam_err = PAM_SERVICE_ERR; + goto err; + } if (strncmp(tty, _PATH_DEV, strlen(_PATH_DEV)) == 0) tty = (const char *)tty + strlen(_PATH_DEV); if (*(const char *)tty == '\0') -- 2.45.0