From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762027AbZEFV6K (ORCPT ); Wed, 6 May 2009 17:58:10 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761395AbZEFVy3 (ORCPT ); Wed, 6 May 2009 17:54:29 -0400 Received: from kroah.org ([198.145.64.141]:56937 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761372AbZEFVyX (ORCPT ); Wed, 6 May 2009 17:54:23 -0400 X-Mailbox-Line: From gregkh@mini.kroah.org Wed May 6 14:47:56 2009 Message-Id: <20090506214756.165886620@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Wed, 06 May 2009 14:45:35 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org, jejb@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , Jake Edge , Eugene Teo , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Johannes Berg , "John W. Linville" , Chris Wright Subject: [patch 07/58] mac80211: fix basic rate bitmap calculation References: <20090506214528.660389067@mini.kroah.org> Content-Disposition: inline; filename=mac80211-fix-basic-rate-bitmap-calculation.patch In-Reply-To: <20090506215017.GA21981@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.29-stable review patch. If anyone has any objections, please let us know. ------------------ From: Johannes Berg upstream commit: 7e0986c17f695952ce5d61ed793ce048ba90a661 "mac80211: fix basic rates setting from association response" introduced a copy/paste error. Unfortunately, this not just leads to wrong data being passed to the driver but is remotely exploitable for some hardware or driver combinations. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville Signed-off-by: Chris Wright --- net/mac80211/mlme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1342,7 +1342,7 @@ static void ieee80211_rx_mgmt_assoc_resp for (i = 0; i < elems.ext_supp_rates_len; i++) { int rate = (elems.ext_supp_rates[i] & 0x7f) * 5; - bool is_basic = !!(elems.supp_rates[i] & 0x80); + bool is_basic = !!(elems.ext_supp_rates[i] & 0x80); if (rate > 110) have_higher_than_11mbit = true;