From owner-svn-src-head@freebsd.org Fri Oct 13 14:36:13 2017 Return-Path: Delivered-To: svn-src-head@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 AEFB9E49C44; Fri, 13 Oct 2017 14:36:13 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 63F69673CB; Fri, 13 Oct 2017 14:36:12 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id 314Le3T7LDJTW314NeZzv5; Fri, 13 Oct 2017 08:36:11 -0600 X-Authority-Analysis: v=2.2 cv=B4DJ6KlM c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=kj9zAlcOel0A:10 a=02M-m0pO-4AA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=qwL64G1b1rMNB4V27MIA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id 9D3A8109; Fri, 13 Oct 2017 07:36:09 -0700 (PDT) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id v9DEa9Je003290; Fri, 13 Oct 2017 07:36:09 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201710131436.v9DEa9Je003290@slippy.cwsent.com> X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.6 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Adrian Chadd cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r324580 - head/sys/net80211 In-Reply-To: Message from Adrian Chadd of "Fri, 13 Oct 2017 06:49:07 -0000." <201710130649.v9D6n7cI036282@repo.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 13 Oct 2017 07:36:09 -0700 X-CMAE-Envelope: MS4wfGkw6bqRHkBxsAhx6E4xrKgOTZdla7vS3Y7/a38JEfeCrYssCjDjoPi8M65XvZgrbljRhk4owz39R867a83a29X6RRQrV1Y3nqmGO4vuoMbQKnz+TasH /d58wvntz2izWw5bvTz+uW9XvZszQbhrVdWudQPn7d/xl4ES/SxqNOjtkz9njDRbxj8kv2Tog5Rq3BNKcERNW0IpJ79VxYv/qU1wwsgDwu4n9+HOZr0M9AyL SmFJyYr1xcvpGDUgiRGj67SHPiPiq/kB5zOIqvKo/smweBhzYKGdvqIGZn7gKu4A X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Oct 2017 14:36:13 -0000 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 FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.