Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 7 Apr 2010 17:51:06 +0000 (UTC)
From:      Rui Paulo <rpaulo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r206371 - head/sys/dev/ral
Message-ID:  <201004071751.o37Hp6kg067550@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004071751.o37Hp6kg067550>