summaryrefslogtreecommitdiff
path: root/net/wireless
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-05-23 18:10:21 +0200
committerJohannes Berg <johannes.berg@intel.com>2013-05-23 18:12:38 +0200
commitc815797663b72e3ac1736f1886538152bc48e4af (patch)
tree023320c601a49b09bdd3aa6ac308a1f8416628b4 /net/wireless
parent6211dd12da609bc6893b9c3182630b494737ec4b (diff)
downloadlinux-3.10-c815797663b72e3ac1736f1886538152bc48e4af.tar.gz
linux-3.10-c815797663b72e3ac1736f1886538152bc48e4af.tar.bz2
linux-3.10-c815797663b72e3ac1736f1886538152bc48e4af.zip
cfg80211: check wdev->netdev in connection work
If a P2P-Device is present and another virtual interface triggers the connection work, the system crash because it tries to check if the P2P-Device's netdev (which doesn't exist) is up. Skip any wdevs that have no netdev to fix this. Cc: stable@vger.kernel.org Reported-by: YanBo <dreamfly281@gmail.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/sme.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index 8b5eddfba1e..3ed35c345ca 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -231,6 +231,9 @@ void cfg80211_conn_work(struct work_struct *work)
mutex_lock(&rdev->sched_scan_mtx);
list_for_each_entry(wdev, &rdev->wdev_list, list) {
+ if (!wdev->netdev)
+ continue;
+
wdev_lock(wdev);
if (!netif_running(wdev->netdev)) {
wdev_unlock(wdev);