From patchwork Thu Mar 14 22:17:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 2274171 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 470983FC8A for ; Thu, 14 Mar 2013 22:18:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753278Ab3CNWSA (ORCPT ); Thu, 14 Mar 2013 18:18:00 -0400 Received: from mail.candelatech.com ([208.74.158.172]:59962 "EHLO ns3.lanforge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753064Ab3CNWR7 (ORCPT ); Thu, 14 Mar 2013 18:17:59 -0400 Received: from localhost.localdomain (firewall.candelatech.com [70.89.124.249]) by ns3.lanforge.com (8.14.2/8.14.2) with ESMTP id r2EMHuho010895 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 14 Mar 2013 15:17:56 -0700 From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: Ben Greear Subject: [PATCH] mac80211: Don't restart sta-timer if not associated. Date: Thu, 14 Mar 2013 15:17:51 -0700 Message-Id: <1363299471-10442-1-git-send-email-greearb@candelatech.com> X-Mailer: git-send-email 1.7.3.4 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ben Greear I found another crash when deleting lots of virtual stations in a congested environment. I think the problem is that the ieee80211_mlme_notify_scan_completed could call ieee80211_restart_sta_timer for a non-associated interface that was about to be deleted. With the following patch I am unable to reproduce the crash. Signed-off-by: Ben Greear --- :100644 100644 81e0619... a1cc8c4... M net/mac80211/mlme.c net/mac80211/mlme.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 81e0619..a1cc8c4 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -2931,6 +2931,9 @@ static void ieee80211_restart_sta_timer(struct ieee80211_sub_if_data *sdata) u32 flags; if (sdata->vif.type == NL80211_IFTYPE_STATION) { + if (unlikely(!sdata->u.mgd.associated)) + return; + __ieee80211_stop_poll(sdata); /* let's probe the connection once */