From owner-svn-src-stable-11@freebsd.org Thu Apr 9 15:30:21 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CB35B2BD37E; Thu, 9 Apr 2020 15:30:21 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48ylT9534bz3FWY; Thu, 9 Apr 2020 15:30:21 +0000 (UTC) (envelope-from eugen@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A89B6EEE9; Thu, 9 Apr 2020 15:30:21 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 039FUL2n074759; Thu, 9 Apr 2020 15:30:21 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 039FUL0Q074758; Thu, 9 Apr 2020 15:30:21 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <202004091530.039FUL0Q074758@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Thu, 9 Apr 2020 15:30:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r359746 - stable/11/sys/net80211 X-SVN-Group: stable-11 X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: stable/11/sys/net80211 X-SVN-Commit-Revision: 359746 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Apr 2020 15:30:21 -0000 Author: eugen Date: Thu Apr 9 15:30:21 2020 New Revision: 359746 URL: https://svnweb.freebsd.org/changeset/base/359746 Log: net80211: fix another possible panic for some drivers This change fixes another case for panic missed in r343035 and seen with run(4)-based system. This is direct commit to stable/11 because r306591 could not be merged due to differences in KPI. Note that stable/12 has this problem fixed already. Modified: stable/11/sys/net80211/ieee80211_amrr.c Modified: stable/11/sys/net80211/ieee80211_amrr.c ============================================================================== --- stable/11/sys/net80211/ieee80211_amrr.c Thu Apr 9 14:44:46 2020 (r359745) +++ stable/11/sys/net80211/ieee80211_amrr.c Thu Apr 9 15:30:21 2020 (r359746) @@ -409,6 +409,9 @@ amrr_tx_update(const struct ieee80211vap *vap, const s struct ieee80211_amrr_node *amn = ni->ni_rctls; int txcnt = *(int *)arg1, success = *(int *)arg2, retrycnt = *(int *)arg3; + if (!amn) + return; + amn->amn_txcnt = txcnt; amn->amn_success = success; amn->amn_retrycnt = retrycnt;