Răsfoiți Sursa

wireless: b43: fix Oops on card eject during transfer

An Oops has once been observed, when the SDIO card had been ejected during
IO. The PC value shows, that the dev pointer in b43_op_stop() was NULL.

(I moved the NULL check before the lock, based upon a suggestion from
Julian Calaby <julian.calaby@gmail.com>. -- JWL)

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Guennadi Liakhovetski 13 ani în urmă
părinte
comite
ccde8a45cb
1 a modificat fișierele cu 4 adăugiri și 1 ștergeri
  1. 4 1
      drivers/net/wireless/b43/main.c

+ 4 - 1
drivers/net/wireless/b43/main.c

@@ -4852,6 +4852,9 @@ static void b43_op_stop(struct ieee80211_hw *hw)
 
 
 	cancel_work_sync(&(wl->beacon_update_trigger));
 	cancel_work_sync(&(wl->beacon_update_trigger));
 
 
+	if (!dev)
+		goto out;
+
 	mutex_lock(&wl->mutex);
 	mutex_lock(&wl->mutex);
 	if (b43_status(dev) >= B43_STAT_STARTED) {
 	if (b43_status(dev) >= B43_STAT_STARTED) {
 		dev = b43_wireless_core_stop(dev);
 		dev = b43_wireless_core_stop(dev);
@@ -4863,7 +4866,7 @@ static void b43_op_stop(struct ieee80211_hw *hw)
 
 
 out_unlock:
 out_unlock:
 	mutex_unlock(&wl->mutex);
 	mutex_unlock(&wl->mutex);
-
+out:
 	cancel_work_sync(&(wl->txpower_adjust_work));
 	cancel_work_sync(&(wl->txpower_adjust_work));
 }
 }