From owner-svn-src-head@FreeBSD.ORG  Mon Mar 22 11:00:57 2010
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 9391F1065673;
	Mon, 22 Mar 2010 11:00:57 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 83D338FC08;
	Mon, 22 Mar 2010 11:00:57 +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 o2MB0vi5001167;
	Mon, 22 Mar 2010 11:00:57 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2MB0vjM001165;
	Mon, 22 Mar 2010 11:00:57 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201003221100.o2MB0vjM001165@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Mon, 22 Mar 2010 11:00:57 +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: r205441 - head/contrib/openpam/include/security
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: Mon, 22 Mar 2010 11:00:57 -0000

Author: des
Date: Mon Mar 22 11:00:57 2010
New Revision: 205441
URL: http://svn.freebsd.org/changeset/base/205441

Log:
  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).

Modified:
  head/contrib/openpam/include/security/pam_appl.h
Directory Properties:
  head/contrib/openpam/   (props changed)

Modified: head/contrib/openpam/include/security/pam_appl.h
==============================================================================
--- head/contrib/openpam/include/security/pam_appl.h	Mon Mar 22 10:58:16 2010	(r205440)
+++ head/contrib/openpam/include/security/pam_appl.h	Mon Mar 22 11:00:57 2010	(r205441)
@@ -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,