From owner-svn-src-head@FreeBSD.ORG  Sun Aug 30 05:12:37 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DD916106564A;
	Sun, 30 Aug 2009 05:12:37 +0000 (UTC) (envelope-from jon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 983DF8FC0A;
	Sun, 30 Aug 2009 05:12:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7U5Cbt6084040;
	Sun, 30 Aug 2009 05:12:37 GMT (envelope-from jon@svn.freebsd.org)
Received: (from jon@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7U5Cbg2084038;
	Sun, 30 Aug 2009 05:12:37 GMT (envelope-from jon@svn.freebsd.org)
Message-Id: <200908300512.n7U5Cbg2084038@svn.freebsd.org>
From: Jonathan Chen <jon@FreeBSD.org>
Date: Sun, 30 Aug 2009 05:12:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196650 - head/lib/libpam/modules/pam_lastlog
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Aug 2009 05:12:38 -0000

Author: jon
Date: Sun Aug 30 05:12:37 2009
New Revision: 196650
URL: http://svn.freebsd.org/changeset/base/196650

Log:
  Prevents pam_lastlog from segfaulting on session close when tty is null.
  
  MFC after:	1 month

Modified:
  head/lib/libpam/modules/pam_lastlog/pam_lastlog.c

Modified: head/lib/libpam/modules/pam_lastlog/pam_lastlog.c
==============================================================================
--- head/lib/libpam/modules/pam_lastlog/pam_lastlog.c	Sun Aug 30 02:07:23 2009	(r196649)
+++ head/lib/libpam/modules/pam_lastlog/pam_lastlog.c	Sun Aug 30 05:12:37 2009	(r196650)
@@ -183,6 +183,11 @@ pam_sm_close_session(pam_handle_t *pamh 
 	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')