From owner-svn-src-stable@FreeBSD.ORG  Sun Dec 27 22:50:26 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4E3EE106568D;
	Sun, 27 Dec 2009 22:50:26 +0000 (UTC)
	(envelope-from mjacob@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3EA498FC1D;
	Sun, 27 Dec 2009 22:50:26 +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 nBRMoQdE070027;
	Sun, 27 Dec 2009 22:50:26 GMT (envelope-from mjacob@svn.freebsd.org)
Received: (from mjacob@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBRMoQgs070025;
	Sun, 27 Dec 2009 22:50:26 GMT (envelope-from mjacob@svn.freebsd.org)
Message-Id: <200912272250.nBRMoQgs070025@svn.freebsd.org>
From: Matt Jacob <mjacob@FreeBSD.org>
Date: Sun, 27 Dec 2009 22:50:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r201068 - stable/8/sys/dev/ips
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Dec 2009 22:50:26 -0000

Author: mjacob
Date: Sun Dec 27 22:50:25 2009
New Revision: 201068
URL: http://svn.freebsd.org/changeset/base/201068

Log:
  MFC of 198329: Check pointer for NULL before dereferencing it, not after.

Modified:
  stable/8/sys/dev/ips/ips_disk.c

Modified: stable/8/sys/dev/ips/ips_disk.c
==============================================================================
--- stable/8/sys/dev/ips/ips_disk.c	Sun Dec 27 22:49:34 2009	(r201067)
+++ stable/8/sys/dev/ips/ips_disk.c	Sun Dec 27 22:50:25 2009	(r201068)
@@ -192,10 +192,10 @@ ipsd_dump(void *arg, void *virtual, vm_o
 
 	dp = arg;
 	dsc = dp->d_drv1;
-	sc = dsc->sc;
 
 	if (dsc == NULL)
 		return (EINVAL);
+	sc = dsc->sc;
 
 	if (ips_get_free_cmd(sc, &command, 0) != 0) {
 		printf("ipsd: failed to get cmd for dump\n");