diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-05-23 18:10:21 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-06-19 02:16:38 +0100 |
| commit | 71eac9d144bec44c29340b0d9905bcba3f4128e6 (patch) | |
| tree | adb8a71e2f486dc0ab6efd73a8983858e97c5122 /net/wireless | |
| parent | 7e41cd93c89b061cfd4421153b74013b6e9de250 (diff) | |
| download | lwn-71eac9d144bec44c29340b0d9905bcba3f4128e6.tar.gz lwn-71eac9d144bec44c29340b0d9905bcba3f4128e6.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>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/sme.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c index 0acfdc9beacf..c1c6e6d8798b 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -220,6 +220,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); |