From patchwork Sat Oct 16 16:49:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 259011 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9GF9W6O007729 for ; Sat, 16 Oct 2010 15:09:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751452Ab0JPPJa (ORCPT ); Sat, 16 Oct 2010 11:09:30 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:51153 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751223Ab0JPPJa (ORCPT ); Sat, 16 Oct 2010 11:09:30 -0400 Received: by bwz15 with SMTP id 15so1769979bwz.19 for ; Sat, 16 Oct 2010 08:09:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:received:from:to:subject:date :user-agent:cc:mime-version:content-type:content-transfer-encoding :message-id; bh=dlBkzmz2l/FjNBq58HoFQ1LgenYHjxJrIyQ5hvN9hYQ=; b=U40GHguQphWZ3xhr8eyP7RshuCJZPRHrCiN4tkyKDbPITUYlUuPkFVw2ZGgijuVdPO JQuPbT03qdmeGLmPM9JlwYzLHcZOcyv3aV4UskpLdbsglr7gx2TvzrumD8flNgXwc648 ixpuktIXGvCQIqVA/jxpA1wHM8xmPNkw5toJg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:to:subject:date:user-agent:cc:mime-version:content-type :content-transfer-encoding:message-id; b=pZnToADomhRFKyYtxYyCDw2JW4eItJP08SGSVl67MoyQ6asSYqhNzsBFEYlePpvk5L Fp+Cx6v2XvxUozsMDoPmeAj6T0OSnug9kTdn3kAWwaCgp9hFzdCBxXla1EKRndzH6RWl excoRVrUn/Sh8F7JypvWkpigLg/t6+bmDguk0= Received: by 10.204.57.3 with SMTP id a3mr2071873bkh.164.1287241739116; Sat, 16 Oct 2010 08:08:59 -0700 (PDT) Received: from debian64.daheim (p549CD996.dip.t-dialin.net [84.156.217.150]) by mx.google.com with ESMTPS id r21sm6779706bkj.10.2010.10.16.08.08.56 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 16 Oct 2010 08:08:58 -0700 (PDT) Received: from debian64.daheim ([192.168.0.4] helo=debian64.localnet ident=chuck) by debian64.daheim with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1P79wc-0007sL-3F; Sat, 16 Oct 2010 18:49:18 +0200 From: Christian Lamparter To: linux-wireless@vger.kernel.org Subject: [PATCH 2.6.36] mac80211: don't sanitize invalid rates Date: Sat, 16 Oct 2010 18:49:15 +0200 User-Agent: KMail/1.13.5 (Linux/2.6.36-rc8-wl+; KDE/4.4.5; x86_64; ; ) Cc: "John W. Linville" , Johannes Berg , Jouni Malinen MIME-Version: 1.0 Message-Id: <201010161849.15787.chunkeey@googlemail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Sat, 16 Oct 2010 15:09:32 +0000 (UTC) diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c index 4f772de..50a1200 100644 --- a/net/mac80211/rate.c +++ b/net/mac80211/rate.c @@ -328,6 +328,9 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata, * if needed. */ for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) { + /* Skip invalid rates */ + if (info->control.rates[i].idx < 0) + break; /* Rate masking supports only legacy rates for now */ if (info->control.rates[i].flags & IEEE80211_TX_RC_MCS) continue;