From owner-p4-projects@FreeBSD.ORG  Mon Jul 23 14:31:12 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DE96D16A41B; Mon, 23 Jul 2007 14:31:11 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AAF4916A41A
	for <perforce@freebsd.org>; Mon, 23 Jul 2007 14:31:11 +0000 (UTC)
	(envelope-from avatar@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9EDD313C469
	for <perforce@freebsd.org>; Mon, 23 Jul 2007 14:31:11 +0000 (UTC)
	(envelope-from avatar@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6NEVBFr073257
	for <perforce@freebsd.org>; Mon, 23 Jul 2007 14:31:11 GMT
	(envelope-from avatar@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6NEVBa6073254
	for perforce@freebsd.org; Mon, 23 Jul 2007 14:31:11 GMT
	(envelope-from avatar@freebsd.org)
Date: Mon, 23 Jul 2007 14:31:11 GMT
Message-Id: <200707231431.l6NEVBa6073254@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	avatar@freebsd.org using -f
From: Tai-hwa Liang <avatar@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 123963 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Jul 2007 14:31:12 -0000

http://perforce.freebsd.org/chv.cgi?CH=123963

Change 123963 by avatar@avatar_t40 on 2007/07/23 14:30:22

	Fixing a possible NULL pointer dereference by making the actual
	assignment after the NULL check.
	Found by:	Coverity Prevent(tm)
	CID:		2303
	Reviewed by:	sam
	MFP4 after:	1 week

Affected files ...

.. //depot/projects/wifi/sys/dev/wi/if_wi.c#40 edit

Differences ...

==== //depot/projects/wifi/sys/dev/wi/if_wi.c#40 (text+ko) ====

@@ -267,12 +267,12 @@
 	int error;
 
 	ifp = sc->sc_ifp = if_alloc(IFT_ETHER);
-	ifp->if_softc = sc;
 	if (ifp == NULL) {
 		device_printf(dev, "can not if_alloc\n");
 		wi_free(dev);
 		return (ENOSPC);
 	}
+	ifp->if_softc = sc;
 
 	/*
 	 * NB: no locking is needed here; don't put it here