From: Johannes Berg Date: Thu, 23 May 2013 16:10:21 +0000 (+0200) Subject: cfg80211: check wdev->netdev in connection work X-Git-Tag: v3.4.92~20 X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=377929f225ac24146fda8c5401553e556872a705;p=unionfs-2.6.27.y.git 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 Signed-off-by: Johannes Berg [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings Cc: Qiang Huang Signed-off-by: Greg Kroah-Hartman --- diff --git a/net/wireless/sme.c b/net/wireless/sme.c index f7e937ff897..3fd50a11c15 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);