diff options
author | Pavel Roskin <proski@gnu.org> | 2011-07-22 18:07:13 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-07-26 16:27:31 -0400 |
commit | e61b52d1309df08b86a35e54a61f0cc932b28291 (patch) | |
tree | 98bed4e7d4ec3a9b40be228e825eebee0e911aca /drivers | |
parent | 6f89062a66d8b88ca89a15a6cebc0bc0db284441 (diff) |
b43: fix invalid memory access in b43_ssb_remove()
wldev is freed in b43_one_core_detach() and should not be accessed after
that call. Keep wldev->dev in a local variable.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/b43/main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index d9f53b791b21..85d6a1f03a08 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
@@ -5350,6 +5350,7 @@ static void b43_ssb_remove(struct ssb_device *sdev) | |||
5350 | { | 5350 | { |
5351 | struct b43_wl *wl = ssb_get_devtypedata(sdev); | 5351 | struct b43_wl *wl = ssb_get_devtypedata(sdev); |
5352 | struct b43_wldev *wldev = ssb_get_drvdata(sdev); | 5352 | struct b43_wldev *wldev = ssb_get_drvdata(sdev); |
5353 | struct b43_bus_dev *dev = wldev->dev; | ||
5353 | 5354 | ||
5354 | /* We must cancel any work here before unregistering from ieee80211, | 5355 | /* We must cancel any work here before unregistering from ieee80211, |
5355 | * as the ieee80211 unreg will destroy the workqueue. */ | 5356 | * as the ieee80211 unreg will destroy the workqueue. */ |
@@ -5365,14 +5366,14 @@ static void b43_ssb_remove(struct ssb_device *sdev) | |||
5365 | ieee80211_unregister_hw(wl->hw); | 5366 | ieee80211_unregister_hw(wl->hw); |
5366 | } | 5367 | } |
5367 | 5368 | ||
5368 | b43_one_core_detach(wldev->dev); | 5369 | b43_one_core_detach(dev); |
5369 | 5370 | ||
5370 | if (list_empty(&wl->devlist)) { | 5371 | if (list_empty(&wl->devlist)) { |
5371 | b43_leds_unregister(wl); | 5372 | b43_leds_unregister(wl); |
5372 | /* Last core on the chip unregistered. | 5373 | /* Last core on the chip unregistered. |
5373 | * We can destroy common struct b43_wl. | 5374 | * We can destroy common struct b43_wl. |
5374 | */ | 5375 | */ |
5375 | b43_wireless_exit(wldev->dev, wl); | 5376 | b43_wireless_exit(dev, wl); |
5376 | } | 5377 | } |
5377 | } | 5378 | } |
5378 | 5379 | ||