From owner-svn-src-head@FreeBSD.ORG  Wed Apr  7 17:51:07 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 10C591065674;
	Wed,  7 Apr 2010 17:51:07 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 018DA8FC16;
	Wed,  7 Apr 2010 17:51:07 +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 o37Hp6Mf067552;
	Wed, 7 Apr 2010 17:51:06 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o37Hp6kg067550;
	Wed, 7 Apr 2010 17:51:06 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <201004071751.o37Hp6kg067550@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Wed, 7 Apr 2010 17:51:06 +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: r206371 - head/sys/dev/ral
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: Wed, 07 Apr 2010 17:51:07 -0000

Author: rpaulo
Date: Wed Apr  7 17:51:06 2010
New Revision: 206371
URL: http://svn.freebsd.org/changeset/base/206371

Log:
  Avoid NULL deref.
  
  Submitted by:	gavin
  MFC after:	1 month

Modified:
  head/sys/dev/ral/rt2661.c

Modified: head/sys/dev/ral/rt2661.c
==============================================================================
--- head/sys/dev/ral/rt2661.c	Wed Apr  7 17:49:47 2010	(r206370)
+++ head/sys/dev/ral/rt2661.c	Wed Apr  7 17:51:06 2010	(r206371)
@@ -900,11 +900,12 @@ rt2661_tx_intr(struct rt2661_softc *sc)
 		data->m = NULL;
 		ni = data->ni;
 		data->ni = NULL;
-		vap = ni->ni_vap;
 
 		/* if no frame has been sent, ignore */
 		if (ni == NULL)
 			continue;
+		else
+			vap = ni->ni_vap;
 
 		switch (RT2661_TX_RESULT(val)) {
 		case RT2661_TX_SUCCESS: