diff options
author | Ben Greear <greearb@candelatech.com> | 2013-06-19 17:06:26 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-06-24 09:55:36 -0400 |
commit | f9bef3df52fe61067e4c1c6cfb2037cb6b259a6a (patch) | |
tree | 80d8f1dfd41630b161095f301d4f158838dc73c0 /net | |
parent | 0e3a39b5620bc84f25ffb0592b05b0350e8b0520 (diff) |
wireless: check for dangling wdev->current_bss pointer
If it *is* still set when the netdev is being deleted,
then we are about to leak a pointer. Warn and clean up
in that case.
Signed-off-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/wireless/core.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 4224e7554a76..672459b9483b 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c | |||
@@ -934,6 +934,12 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb, | |||
934 | * freed. | 934 | * freed. |
935 | */ | 935 | */ |
936 | cfg80211_process_wdev_events(wdev); | 936 | cfg80211_process_wdev_events(wdev); |
937 | |||
938 | if (WARN_ON(wdev->current_bss)) { | ||
939 | cfg80211_unhold_bss(wdev->current_bss); | ||
940 | cfg80211_put_bss(wdev->wiphy, &wdev->current_bss->pub); | ||
941 | wdev->current_bss = NULL; | ||
942 | } | ||
937 | break; | 943 | break; |
938 | case NETDEV_PRE_UP: | 944 | case NETDEV_PRE_UP: |
939 | if (!(wdev->wiphy->interface_modes & BIT(wdev->iftype))) | 945 | if (!(wdev->wiphy->interface_modes & BIT(wdev->iftype))) |