Return-Path: Message-Id: <20130703184053.852163593@goodmis.org> Date: Wed, 03 Jul 2013 14:39:53 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: YanBo , Johannes Berg Subject: [056/141] cfg80211: check wdev->netdev in connection work References: <20130703183857.307196999@goodmis.org> Content-Disposition: inline; filename=0056-cfg80211-check-wdev-netdev-in-connection-work.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.6.11.6 stable review patch. If anyone has any objections, please let me know. ------------------ From: Johannes Berg [ Upstream commit c815797663b72e3ac1736f1886538152bc48e4af ] 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. Cc: stable@vger.kernel.org Reported-by: YanBo Signed-off-by: Johannes Berg Signed-off-by: Steven Rostedt --- net/wireless/sme.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/wireless/sme.c b/net/wireless/sme.c index 6f39cb8..1015221 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->wdev_list, list) { + if (!wdev->netdev) + continue; + wdev_lock(wdev); if (!netif_running(wdev->netdev)) { wdev_unlock(wdev); -- 1.7.10.4