Patchwork [03/93] cfg80211: check wdev->netdev in connection work

login
register
mail settings
Submitter Luis Henriques
Date June 18, 2013, 11:42 a.m.
Message ID <1371555821-12820-4-git-send-email-luis.henriques@canonical.com>
Download mbox | patch
Permalink /patch/252256/
State New
Headers show

Comments

Luis Henriques - June 18, 2013, 11:42 a.m.
3.5.7.15 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Johannes Berg <johannes.berg@intel.com>

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>
[ luis: backport to 3.5: adjust context ]
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---
 net/wireless/sme.c | 3 +++
 1 file changed, 3 insertions(+)

Patch

diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index f7e937f..3fd50a1 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);