aboutsummaryrefslogtreecommitdiff
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>2014-06-07 16:02:14 -0700
commit377929f225ac24146fda8c5401553e556872a705 (patch)
tree47fb2343025331853effc5b5e1dd7189a9ab8fa6 /net
parent77dcc24b5bb3af980e88831266ed27507a788c52 (diff)
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> [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Cc: Qiang Huang <h.huangqiang@huawei.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 f7e937ff8978..3fd50a11c150 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -222,6 +222,9 @@ void cfg80211_conn_work(struct work_struct *work)
mutex_lock(&rdev->devlist_mtx);
list_for_each_entry(wdev, &rdev->netdev_list, list) {
+ if (!wdev->netdev)
+ continue;
+
wdev_lock(wdev);
if (!netif_running(wdev->netdev)) {
wdev_unlock(wdev);