Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 9 Apr 2020 15:30:21 +0000 (UTC)
From:      Eugene Grosbein <eugen@FreeBSD.org>
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
Message-ID:  <202004091530.039FUL0Q074758@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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;



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