From owner-svn-src-all@FreeBSD.ORG  Mon Nov 17 07:09:40 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DEF671065688;
	Mon, 17 Nov 2008 07:09:40 +0000 (UTC)
	(envelope-from philip@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CA6CD8FC1B;
	Mon, 17 Nov 2008 07:09:40 +0000 (UTC)
	(envelope-from philip@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAH79eV8075978;
	Mon, 17 Nov 2008 07:09:40 GMT (envelope-from philip@svn.freebsd.org)
Received: (from philip@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAH79ecr075977;
	Mon, 17 Nov 2008 07:09:40 GMT (envelope-from philip@svn.freebsd.org)
Message-Id: <200811170709.mAH79ecr075977@svn.freebsd.org>
From: Philip Paeps <philip@FreeBSD.org>
Date: Mon, 17 Nov 2008 07:09:40 +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: r185021 - head/sys/dev/glxsb
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Nov 2008 07:09:41 -0000

Author: philip
Date: Mon Nov 17 07:09:40 2008
New Revision: 185021
URL: http://svn.freebsd.org/changeset/base/185021

Log:
  Fix two possible (but unlikely) NULL-pointer dereferences in glxsb(4).
  
  Spotted by:	Coverity
  MFC after:	1 week

Modified:
  head/sys/dev/glxsb/glxsb.c

Modified: head/sys/dev/glxsb/glxsb.c
==============================================================================
--- head/sys/dev/glxsb/glxsb.c	Mon Nov 17 07:03:05 2008	(r185020)
+++ head/sys/dev/glxsb/glxsb.c	Mon Nov 17 07:09:40 2008	(r185021)
@@ -358,7 +358,8 @@ glxsb_detach(device_t dev)
 			return (EBUSY);
 		}
 	}
-	while ((ses = TAILQ_FIRST(&sc->sc_sessions)) != NULL) {
+	while (!TAILQ_EMPTY(&sc->sc_sessions)) {
+		ses = TAILQ_FIRST(&sc->sc_sessions);
 		TAILQ_REMOVE(&sc->sc_sessions, ses, ses_next);
 		free(ses, M_GLXSB);
 	}
@@ -867,8 +868,11 @@ glxsb_crypto_process(device_t dev, struc
 
 	enccrd = maccrd = NULL;
 
-	if (crp == NULL ||
-	    crp->crp_callback == NULL || crp->crp_desc == NULL) {
+	/* Sanity check. */
+	if (crp == NULL)
+		return (EINVAL);
+
+	if (crp->crp_callback == NULL || crp->crp_desc == NULL) {
 		error = EINVAL;
 		goto fail;
 	}