From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81BB3C28EBD for ; Sun, 9 Jun 2019 17:00:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 51FBF204EC for ; Sun, 9 Jun 2019 17:00:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560099624; bh=vjH8NLgMbzgGNnnBATPcMZOuP+sfomC2odmkh0iOk40=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=j0KzISgrSQnF1kDEqvOa2QeEslMI6mrzhiLDpkHu51nam3KrNW9KurYdXEzpsRaGa HNdEde24xtoEKCAYSM7iHMkgUW4xN6gkGDulRJfhSvvA35wL+TLEPVtVW0HBbU+rHO Wi2bY7R7yEqbusYgc3eBCwPs9vypQmTtzTER/pLY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387841AbfFIRAX (ORCPT ); Sun, 9 Jun 2019 13:00:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:36636 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387816AbfFIRAR (ORCPT ); Sun, 9 Jun 2019 13:00:17 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 807E0206C3; Sun, 9 Jun 2019 17:00:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560099617; bh=vjH8NLgMbzgGNnnBATPcMZOuP+sfomC2odmkh0iOk40=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LQsHk620yjHdPpyq9jDQZT3vxahNJE5ekSZ7qovxk3Q/q0ME8FAZpt0w+LCcbP+zz X+MjFDJhNOGqEHnlx/6BU27RCQ371XqgBe40Icz8nrm8vsgWJtNRUnxnc+UCMEo6z+ kqKDGCadkkkHAzPkV2lLsGFbnSPf/qw0GVPGTt00= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Kalle Valo , Sasha Levin Subject: [PATCH 4.4 105/241] mwifiex: prevent an array overflow Date: Sun, 9 Jun 2019 18:40:47 +0200 Message-Id: <20190609164150.824354100@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190609164147.729157653@linuxfoundation.org> References: <20190609164147.729157653@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit b4c35c17227fe437ded17ce683a6927845f8c4a4 ] The "rate_index" is only used as an index into the phist_data->rx_rate[] array in the mwifiex_hist_data_set() function. That array has MWIFIEX_MAX_AC_RX_RATES (74) elements and it's used to generate some debugfs information. The "rate_index" variable comes from the network skb->data[] and it is a u8 so it's in the 0-255 range. We need to cap it to prevent an array overflow. Fixes: cbf6e05527a7 ("mwifiex: add rx histogram statistics support") Signed-off-by: Dan Carpenter Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/mwifiex/cfp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/wireless/mwifiex/cfp.c b/drivers/net/wireless/mwifiex/cfp.c index 3ddb8ec676ed3..6dd331dfb5179 100644 --- a/drivers/net/wireless/mwifiex/cfp.c +++ b/drivers/net/wireless/mwifiex/cfp.c @@ -533,5 +533,8 @@ u8 mwifiex_adjust_data_rate(struct mwifiex_private *priv, rate_index = (rx_rate > MWIFIEX_RATE_INDEX_OFDM0) ? rx_rate - 1 : rx_rate; + if (rate_index >= MWIFIEX_MAX_AC_RX_RATES) + rate_index = MWIFIEX_MAX_AC_RX_RATES - 1; + return rate_index; } -- 2.20.1