summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-05-23 18:10:21 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-07 12:53:34 -0700
commitd11abfdb44b3265080020052b81485f6ac5eecab (patch)
tree678f04057a4f22394fb5a4aed9dac982f45844ee /net
parentb2ba5adbf6766a8b49425763ec0c2c182a088f92 (diff)
downloadlwn-d11abfdb44b3265080020052b81485f6ac5eecab.tar.gz
lwn-d11abfdb44b3265080020052b81485f6ac5eecab.zip
cfg80211: check wdev->netdev in connection work
commit c815797663b72e3ac1736f1886538152bc48e4af upstream. 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. Reported-by: YanBo <dreamfly281@gmail.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-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 482c70e70127..5b2d0a013232 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -227,6 +227,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);