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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 C9D5CC432C3 for ; Tue, 26 Nov 2019 08:04:31 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9FB3E20722 for ; Tue, 26 Nov 2019 08:04:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="EsmeBp8x"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="AP3k+6NL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9FB3E20722 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:References :In-Reply-To:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=XSOR8j+9ZLLmnuyxEXk54ttds9cPSrdnSnImQEalfbs=; b=EsmeBp8xDP7nex MTwjl2Ral3KGSRCAbBo180itDmVMbhQ5oMt3seJmTY9Tcw6tvIIvnJRQwoBzef4XHQPEh12mA3ua2 d2EOmsBhWrdWWqWiNfayW/K3z+y0hZ17IsoLhmWYqImt1ut4Zw34plL9fwVYA+df99xJPjnZYtZwg 7OfDsSaycLjVNVNVAiC991MOV7KU02diCgyo2t7CdnnRzH5Mry7PPOlDK32BXZHdjybzYkAFLJ/BQ +GzsRYINPneVKE+Iz07DBJpSTomjvNiaN2wX/3j+7Da5ZM4rEkYPbkw0k5GdW/2wh3jhpZ4Ayc41k D7Xbmpwnk3mDZysT+0jQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iZVpm-0005mn-Qu; Tue, 26 Nov 2019 08:04:30 +0000 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120] helo=us-smtp-1.mimecast.com) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iZVpi-0005lz-R5 for linux-mediatek@lists.infradead.org; Tue, 26 Nov 2019 08:04:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574755463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=p0QjVXdu4Y2AOINMSIfcze5ED2P1CMqFasZGrM6CNSw=; b=AP3k+6NLkDL9G4rGedrJnCL7yiPNqprOccmxdyTfQyDX1WEmIa7HnZ+VfOsuCc4rbZRPJG QWdKa1LZ+lyTIPpn0sUS5X51MfGsKxJZWit4Oxn6wM2ww8AoEoBQzPWld5+EuOBYikJTDt RTvm+FPiC7/VKiZyZJB+9/vbHyQNV50= Received: from mail-lj1-f200.google.com (mail-lj1-f200.google.com [209.85.208.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-392--ipUdqnlNueQ5ZgfizimGQ-1; Tue, 26 Nov 2019 03:04:19 -0500 Received: by mail-lj1-f200.google.com with SMTP id c17so3517364ljn.3 for ; Tue, 26 Nov 2019 00:04:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=xAdyr+rwPBLDYub0Hn/ky8FJbrCeMk6nQjNxbDanCII=; b=SlirHOS86a+Mkgfb0IDiakelrz8nd/nJiOEmvB9go2+dbipnBUmDik7X+wxqyE485L rNPbeVb2WrG31hQmk6qn6IMvWHVtG9KV5Vb0dd0BKos3BZEUdnCZaxeOYpvmmmh44R7K Rp8dIEtlXp7yreahOa9ZySj+xpe4mtQkdy7BRLLEewd9LOYwYreh3JYPPU1Jx/lWob0x qEysX6I+vGabPlSn0Oujxq/k70YkByvEoMt5VQ1LWePtKwZjjyYRMq+XvtKdzu4FlGPM hmBdU7WixQl8ZqFk5/zB2GwRgGbe1xZwMhS3op6V74h+50hJZ1iSw/A7MaC/Ot+IHHXX q6jQ== X-Gm-Message-State: APjAAAV98/x2M2OURuQhnVhbajKuth3eXHcPQLSHzVOZk6wrdPmn2CN1 lgt1014gGZagtIF+gRtdsmNLUo1E8BjHVtNfFIfN2G8ifSL5rD6diuP1c7V1hUYAkj2OvPqI2uA DQdcokLKFYw3jPpW6gPS838MRSvt/+gAR X-Received: by 2002:ac2:4553:: with SMTP id j19mr24471024lfm.142.1574755458279; Tue, 26 Nov 2019 00:04:18 -0800 (PST) X-Google-Smtp-Source: APXvYqw32eL/XdPUwR/CzkaxG5SqjRG2kkpXaZKBrJPo2BO5WZZmA6tdOKC/JAyRfetBu+oBmdQytA== X-Received: by 2002:ac2:4553:: with SMTP id j19mr24470996lfm.142.1574755458008; Tue, 26 Nov 2019 00:04:18 -0800 (PST) Received: from alrua-x1.borgediget.toke.dk ([2a0c:4d80:42:443::2]) by smtp.gmail.com with ESMTPSA id n14sm4744577lfe.40.2019.11.26.00.04.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 00:04:17 -0800 (PST) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 5460B1818BF; Tue, 26 Nov 2019 09:04:15 +0100 (CET) From: Toke =?utf-8?Q?H=C3=B8iland-J=C3=B8rgensen?= To: Dan Carpenter , Felix Fietkau Subject: Re: [PATCH] mt76: Off by one in mt76_calc_rx_airtime() In-Reply-To: <20191121213935.2cbgh3qmd4hv4v5a@kili.mountain> References: <20191121213935.2cbgh3qmd4hv4v5a@kili.mountain> X-Clacks-Overhead: GNU Terry Pratchett Date: Tue, 26 Nov 2019 09:04:15 +0100 Message-ID: <87v9r7ysg0.fsf@toke.dk> MIME-Version: 1.0 X-MC-Unique: -ipUdqnlNueQ5ZgfizimGQ-1 X-Mimecast-Spam-Score: 0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191126_000426_953853_D487604E X-CRM114-Status: GOOD ( 14.06 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ryder Lee , kernel-janitors@vger.kernel.org, linux-wireless@vger.kernel.org, Matthias Brugger , linux-mediatek@lists.infradead.org, Roy Luo , Lorenzo Bianconi , Kalle Valo Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Dan Carpenter writes: > The sband->bitrates[] array has "sband->n_bitrates" elements so this > check needs to be >= instead of > or we could read beyond the end of the > array. > > These values come from when we call mt76_register_device(): > > ret = mt76_register_device(&dev->mt76, true, mt7603_rates, > ARRAY_SIZE(mt7603_rates)); > > Here sband->bitrates[] is mt7603_rates[] and ->n_bitrates is the > ARRAY_SIZE() > > Fixes: 5ce09c1a7907 ("mt76: track rx airtime for airtime fairness and survey") > Signed-off-by: Dan Carpenter > --- > drivers/net/wireless/mediatek/mt76/airtime.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/mediatek/mt76/airtime.c b/drivers/net/wireless/mediatek/mt76/airtime.c > index 55116f395f9a..a4a785467748 100644 > --- a/drivers/net/wireless/mediatek/mt76/airtime.c > +++ b/drivers/net/wireless/mediatek/mt76/airtime.c > @@ -242,7 +242,7 @@ u32 mt76_calc_rx_airtime(struct mt76_dev *dev, struct mt76_rx_status *status, > return 0; > > sband = dev->hw->wiphy->bands[status->band]; > - if (!sband || status->rate_idx > sband->n_bitrates) > + if (!sband || status->rate_idx >= sband->n_bitrates) > return 0; > > rate = &sband->bitrates[status->rate_idx]; This code has recently been ported to mac80211 (net/mac80211/airtime.c). It seems that the bug is also present there; care to send a patch for that as well? :) -Toke _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek