Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 30 Jul 2017 18:29:28 +0000 (UTC)
From:      Andriy Voskoboinyk <avos@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: r321724 - stable/11/sys/net80211
Message-ID:  <201707301829.v6UITS4R081374@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: avos
Date: Sun Jul 30 18:29:28 2017
New Revision: 321724
URL: https://svnweb.freebsd.org/changeset/base/321724

Log:
  MFC r321401:
  net80211: do not allow to unload rate control module if it is still in use.
  
  Keep 'nrefs' counter up-to-date, so 'kldunload wlan_amrr' with 1+ active
  wlan(4) interface will not lead to kernel panic.

Modified:
  stable/11/sys/net80211/ieee80211_amrr.c
  stable/11/sys/net80211/ieee80211_rssadapt.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/net80211/ieee80211_amrr.c
==============================================================================
--- stable/11/sys/net80211/ieee80211_amrr.c	Sun Jul 30 18:01:34 2017	(r321723)
+++ stable/11/sys/net80211/ieee80211_amrr.c	Sun Jul 30 18:29:28 2017	(r321724)
@@ -117,6 +117,7 @@ amrr_init(struct ieee80211vap *vap)
 
 	KASSERT(vap->iv_rs == NULL, ("%s called multiple times", __func__));
 
+	nrefs++;		/* XXX locking */
 	amrr = vap->iv_rs = IEEE80211_MALLOC(sizeof(struct ieee80211_amrr),
 	    M_80211_RATECTL, IEEE80211_M_NOWAIT | IEEE80211_M_ZERO);
 	if (amrr == NULL) {
@@ -133,6 +134,8 @@ static void
 amrr_deinit(struct ieee80211vap *vap)
 {
 	IEEE80211_FREE(vap->iv_rs, M_80211_RATECTL);
+	KASSERT(nrefs > 0, ("imbalanced attach/detach"));
+	nrefs--;		/* XXX locking */
 }
 
 /*

Modified: stable/11/sys/net80211/ieee80211_rssadapt.c
==============================================================================
--- stable/11/sys/net80211/ieee80211_rssadapt.c	Sun Jul 30 18:01:34 2017	(r321723)
+++ stable/11/sys/net80211/ieee80211_rssadapt.c	Sun Jul 30 18:29:28 2017	(r321724)
@@ -131,7 +131,8 @@ rssadapt_init(struct ieee80211vap *vap)
 
 	KASSERT(vap->iv_rs == NULL, ("%s: iv_rs already initialized",
 	    __func__));
-	
+
+	nrefs++;		/* XXX locking */
 	vap->iv_rs = rs = IEEE80211_MALLOC(sizeof(struct ieee80211_rssadapt),
 	    M_80211_RATECTL, IEEE80211_M_NOWAIT | IEEE80211_M_ZERO);
 	if (rs == NULL) {
@@ -147,6 +148,8 @@ static void
 rssadapt_deinit(struct ieee80211vap *vap)
 {
 	IEEE80211_FREE(vap->iv_rs, M_80211_RATECTL);
+	KASSERT(nrefs > 0, ("imbalanced attach/detach"));
+	nrefs--;		/* XXX locking */
 }
 
 static void

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