Date: Fri, 13 Oct 2017 07:36:09 -0700 From: Cy Schubert <Cy.Schubert@komquats.com> To: Adrian Chadd <adrian@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r324580 - head/sys/net80211 Message-ID: <201710131436.v9DEa9Je003290@slippy.cwsent.com> In-Reply-To: Message from Adrian Chadd <adrian@FreeBSD.org> of "Fri, 13 Oct 2017 06:49:07 -0000." <201710130649.v9D6n7cI036282@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
In message <201710130649.v9D6n7cI036282@repo.freebsd.org>, Adrian Chadd writes: > 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 */ > Thank you. This fixes it. -- Cheers, Cy Schubert <Cy.Schubert@cschubert.com> FreeBSD UNIX: <cy@FreeBSD.org> Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710131436.v9DEa9Je003290>