From owner-svn-src-head@freebsd.org  Tue Apr 26 19:06:29 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E0D50B1CFAE;
 Tue, 26 Apr 2016 19:06:29 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B35E31BCC;
 Tue, 26 Apr 2016 19:06:29 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3QJ6SDX010078;
 Tue, 26 Apr 2016 19:06:28 GMT (envelope-from cem@FreeBSD.org)
Received: (from cem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3QJ6SXQ010077;
 Tue, 26 Apr 2016 19:06:28 GMT (envelope-from cem@FreeBSD.org)
Message-Id: <201604261906.u3QJ6SXQ010077@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org
 using -f
From: "Conrad E. Meyer" <cem@FreeBSD.org>
Date: Tue, 26 Apr 2016 19:06:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298659 - head/sys/dev/iwm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Apr 2016 19:06:30 -0000

Author: cem
Date: Tue Apr 26 19:06:28 2016
New Revision: 298659
URL: https://svnweb.freebsd.org/changeset/base/298659

Log:
  iwm(4): Don't dereference potentially NULL pointer before NULL check
  
  Introduced in r298594.  There is no path before the 'vap == NULL' check where
  vap is not already dereferenced.
  
  Reported by:	Coverity
  CID:		1354979
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sys/dev/iwm/if_iwm.c

Modified: head/sys/dev/iwm/if_iwm.c
==============================================================================
--- head/sys/dev/iwm/if_iwm.c	Tue Apr 26 18:54:44 2016	(r298658)
+++ head/sys/dev/iwm/if_iwm.c	Tue Apr 26 19:06:28 2016	(r298659)
@@ -4377,7 +4377,7 @@ iwm_intr(void *arg)
 		device_printf(sc->sc_dev,
 		    "  rx ring: cur=%d\n", sc->rxq.cur);
 		device_printf(sc->sc_dev,
-		    "  802.11 state %d\n", vap->iv_state);
+		    "  802.11 state %d\n", (vap == NULL) ? -1 : vap->iv_state);
 
 		/* Don't stop the device; just do a VAP restart */
 		IWM_UNLOCK(sc);