From owner-svn-src-all@freebsd.org  Fri Oct 13 06:49:08 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 A9F87E3EA80;
 Fri, 13 Oct 2017 06:49:08 +0000 (UTC)
 (envelope-from adrian@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 78BB07628E;
 Fri, 13 Oct 2017 06:49:08 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9D6n7aP036283;
 Fri, 13 Oct 2017 06:49:07 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9D6n7cI036282;
 Fri, 13 Oct 2017 06:49:07 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201710130649.v9D6n7cI036282@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Fri, 13 Oct 2017 06:49:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r324580 - head/sys/net80211
X-SVN-Group: head
X-SVN-Commit-Author: adrian
X-SVN-Commit-Paths: head/sys/net80211
X-SVN-Commit-Revision: 324580
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Oct 2017 06:49:08 -0000

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 */