Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 13 Oct 2017 06:49:07 +0000 (UTC)
From:      Adrian Chadd <adrian@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r324580 - head/sys/net80211
Message-ID:  <201710130649.v9D6n7cI036282@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adrian
Date: Fri Oct 13 06:49:07 2017
New Revision: 324580
URL: https://svnweb.freebsd.org/changeset/base/324580

Log:
  [net80211] don't try to follow a NULL rxs pointer down the sink.
  
  It's smelly, and we already checked earlier whether we needed to.

Modified:
  head/sys/net80211/ieee80211_input.h

Modified: head/sys/net80211/ieee80211_input.h
==============================================================================
--- head/sys/net80211/ieee80211_input.h	Fri Oct 13 05:14:54 2017	(r324579)
+++ head/sys/net80211/ieee80211_input.h	Fri Oct 13 06:49:07 2017	(r324580)
@@ -278,7 +278,7 @@ ok:
 	 */
 	if (ieee80211_check_rxseq_amsdu_more(rxs)) {
 		ni->ni_rxseqs[tid] = rxseq;
-		if (ieee80211_check_rxseq_amsdu(rxs))
+		if ((rxs != NULL) && ieee80211_check_rxseq_amsdu(rxs))
 			IEEE80211_NODE_STAT(ni, rx_amsdu_more_end);
 	} else {
 		/* .. still waiting */



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