From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932959Ab1BPAsk (ORCPT ); Tue, 15 Feb 2011 19:48:40 -0500 Received: from kroah.org ([198.145.64.141]:45461 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932783Ab1BPAsc (ORCPT ); Tue, 15 Feb 2011 19:48:32 -0500 X-Mailbox-Line: From gregkh@clark.kroah.org Tue Feb 15 16:21:03 2011 Message-Id: <20110216002103.804738217@clark.kroah.org> User-Agent: quilt/0.48-11.2 Date: Tue, 15 Feb 2011 16:20:15 -0800 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Felix Fietkau , "John W. Linville" Subject: [patch 047/176] mac80211: fix a crash in ieee80211_beacon_get_tim on change_interface In-Reply-To: <20110216002212.GA9246@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.36-stable review patch. If anyone has any objections, please let us know. ------------------ From: Felix Fietkau commit eb3e554b4b3a56386ef5214dbe0e3935a350178b upstream. Some drivers (e.g. ath9k) do not always disable beacons when they're supposed to. When an interface is changed using the change_interface op, the mode specific sdata part is in an undefined state and trying to get a beacon at this point can produce weird crashes. To fix this, add a check for ieee80211_sdata_running before using anything from the sdata. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman --- net/mac80211/tx.c | 3 +++ 1 file changed, 3 insertions(+) --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -2175,6 +2175,9 @@ struct sk_buff *ieee80211_beacon_get_tim sdata = vif_to_sdata(vif); + if (!ieee80211_sdata_running(sdata)) + goto out; + if (tim_offset) *tim_offset = 0; if (tim_length)