From patchwork Sat May 8 16:24:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 97922 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o48GOwL5010993 for ; Sat, 8 May 2010 16:24:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753898Ab0EHQY5 (ORCPT ); Sat, 8 May 2010 12:24:57 -0400 Received: from mail-qy0-f183.google.com ([209.85.221.183]:33999 "EHLO mail-qy0-f183.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753702Ab0EHQY4 (ORCPT ); Sat, 8 May 2010 12:24:56 -0400 Received: by qyk13 with SMTP id 13so3448325qyk.1 for ; Sat, 08 May 2010 09:24:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=EujscU+Aw9oSZBjcQA+um5rL2XknU3Wpz/spQW5vZ/8=; b=wg2TsvWtDqeHfQdmmMtNcPoGBWLo9iPSnllr3cSUxTHwghuCxvwFMu5k0grjbHHHNe DyG3RqcAVFyyqLkH7IBvWdFCUNagnSX8o0jo0TMVyuDYZ4uv/DjA35AOSqKXbcgp+VLV WQQEItPPTd0aMZLKdil+Z2XJBuz32CQ0DYCeQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=lh+owbgMPU9jzMCa76MAkAjO0O8yPh9gI9Q8D6nuf4KwduH65wHb7QBzTN6rAuUXL2 gydJwo+Nkn0C6kNGuF78RS06LWjCVOOLmy0BL3UrUge4gKNqlVzZRNIpUUnPTUNceQNJ P4rN0yOeF6TK2HVHBPZeeUzojYYpu2J1LaNtU= Received: by 10.229.217.208 with SMTP id hn16mr1220767qcb.87.1273335893967; Sat, 08 May 2010 09:24:53 -0700 (PDT) Received: from bicker ([205.177.176.130]) by mx.google.com with ESMTPS id f5sm2074460qcg.2.2010.05.08.09.24.47 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 08 May 2010 09:24:53 -0700 (PDT) Date: Sat, 8 May 2010 18:24:38 +0200 From: Dan Carpenter To: Jiri Slaby Cc: Nick Kossifidis , "Luis R. Rodriguez" , Bob Copeland , "John W. Linville" , Bruno Randolf , linux-wireless@vger.kernel.org, ath5k-devel@venema.h4ckr.net Subject: [patch 6/9] ath5k: several off by one range checks Message-ID: <20100508162438.GR27064@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) 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 (demeter.kernel.org [140.211.167.41]); Sat, 08 May 2010 16:24:58 +0000 (UTC) diff --git a/drivers/net/wireless/ath/ath5k/ani.c b/drivers/net/wireless/ath/ath5k/ani.c index 584a328..f2311ab 100644 --- a/drivers/net/wireless/ath/ath5k/ani.c +++ b/drivers/net/wireless/ath/ath5k/ani.c @@ -73,7 +73,7 @@ ath5k_ani_set_noise_immunity_level(struct ath5k_hw *ah, int level) const s8 hi[] = { -14, -12 }; const s8 fr[] = { -78, -80 }; #endif - if (level < 0 || level > ARRAY_SIZE(sz)) { + if (level < 0 || level >= ARRAY_SIZE(sz)) { ATH5K_DBG_UNLIMIT(ah->ah_sc, ATH5K_DEBUG_ANI, "level out of range %d", level); return; @@ -104,7 +104,7 @@ ath5k_ani_set_spur_immunity_level(struct ath5k_hw *ah, int level) { const int val[] = { 2, 4, 6, 8, 10, 12, 14, 16 }; - if (level < 0 || level > ARRAY_SIZE(val) || + if (level < 0 || level >= ARRAY_SIZE(val) || level > ah->ah_sc->ani_state.max_spur_level) { ATH5K_DBG_UNLIMIT(ah->ah_sc, ATH5K_DEBUG_ANI, "level out of range %d", level); @@ -129,7 +129,7 @@ ath5k_ani_set_firstep_level(struct ath5k_hw *ah, int level) { const int val[] = { 0, 4, 8 }; - if (level < 0 || level > ARRAY_SIZE(val)) { + if (level < 0 || level >= ARRAY_SIZE(val)) { ATH5K_DBG_UNLIMIT(ah->ah_sc, ATH5K_DEBUG_ANI, "level out of range %d", level); return;