From mboxrd@z Thu Jan 1 00:00:00 1970 From: Toke =?utf-8?Q?H=C3=B8iland-J=C3=B8rgensen?= Date: Tue, 26 Nov 2019 09:16:10 +0000 Subject: Re: [PATCH] mt76: Off by one in mt76_calc_rx_airtime() Message-Id: <87h82ryp45.fsf@toke.dk> List-Id: References: <20191121213935.2cbgh3qmd4hv4v5a@kili.mountain> <87v9r7ysg0.fsf@toke.dk> <20191126091150.GA1759@kadam> In-Reply-To: <20191126091150.GA1759@kadam> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: Dan Carpenter 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 , Felix Fietkau Dan Carpenter writes: > On Tue, Nov 26, 2019 at 09:04:15AM +0100, Toke Høiland-Jørgensen wrote: >> 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? :) > > Oh. Thanks for pointing that out. I actually saw the static checker > warning for that and ignored it thinking that it was the same code. > :P Well, it's copy-pasted from the same code ;) The plan is to get rid of the version inside mt76; was waiting for the trees to converge, though, so I guess after the merge window? > I will send a fix for it. Great, thanks! -Toke 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 AA4F8C432C3 for ; Tue, 26 Nov 2019 09:16:24 +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 7EC1C20678 for ; Tue, 26 Nov 2019 09:16:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="m3+Btbmd"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="EdpzRc8J" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7EC1C20678 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=Wb4BB6Byj7EDvdEzbJS6zPuX2uJ94lWcECr0/0ucCSg=; b=m3+BtbmdGs0VDd IcJuq5RJcpQISQTKXfKwA7aeT79ZxN+Y9lfaiCezB2URveTBdDvM7WuQ6Teko7aGNwF7EnYhba7kp lQjStycxCeZNYsOyCHkpuRaWhu1Y2NqQPlPxLD8LV7rCI593PDqeNSB6P3SvfHOBGxwajrywxij1F qUDeil3kGQDkCH4D2e3SbIJZRl1phCZ59RL6XCWl9DoUbGlgwGx3vdbkEumGCOf5+wfj2aC4/vaVn LR+szOOOfgs1UbjvMUq62qBW9xPvdkleft0uGswcFDPOcd1wJ3qyQe1BAp2p5CVf0/yq9lazf77io UDsDXR8TkPkox+SvhV7g==; 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 1iZWxM-0004z6-42; Tue, 26 Nov 2019 09:16:24 +0000 Received: from us-smtp-1.mimecast.com ([207.211.31.81]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iZWxI-0004yR-TW for linux-mediatek@lists.infradead.org; Tue, 26 Nov 2019 09:16:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574759777; 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=vb+oxQxZRkNlkuBEQUYVCl/O5AvuVY4nZz95WVzmQq8=; b=EdpzRc8JhTiLchPwYZZW4ww4kbVEkgW9pr17buLOHPZQg9bexXfyw5LKraQ8SCG00g55Cn cCNU0TYQVW+q5hb2QOAwkWmLj5reGG/zAa+CS17olWpXpca5yGt7Kp27+AeYiY618tjxms 1vnheu8hrmCQ+HES95LBzqpjO0VKbn0= Received: from mail-lj1-f199.google.com (mail-lj1-f199.google.com [209.85.208.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-5-I-j--IWBNSawGohks0IMlQ-1; Tue, 26 Nov 2019 04:16:14 -0500 Received: by mail-lj1-f199.google.com with SMTP id n11so3546443lji.9 for ; Tue, 26 Nov 2019 01:16:13 -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:content-transfer-encoding; bh=+GixzF/KaQHv0D6//vs+c5ZE/FXLP7KWC/hh8q0IT38=; b=D0vWH8vHtCpnG7LXOWG4QzSPcvaW1bl+cFPuynzzGyo4QUPjl/Bgv+wTIIrW2yVRoA dDYuSqBPgJ9l9lhytyWV07fAJMqssqgGfmsDPGJNSxTX1OeMeiyTZsU8FkQbiMdIVW+Q FFKEJbV/q4pxAVLswJDqHBwnqSK8LeHOwst0IU2FgUzHjZqrWSl3tGO49whgWVVovkEw AmA3uPlSc6QA6e9i848YNQwz/HkroOJSVERIFPu3U1DrlVs3WciSpa/j/JNg92y5gf5S nVHr9EOvDramdLAmPLH4XfJYS6CF1UZSvYRvgLiYoqpTKGblL3d/nnjnVA3WCXZ+a8d/ Q5LQ== X-Gm-Message-State: APjAAAXmnB5XllQRb3h+VFp9+Ly/51hZxputndhARdu+udMwplyhDmEn T82WnWZL+ZPZSFTccwoUW+D3Bj6wxnrPPKutFtAi258+djfWJOaoXh88LMOYB+cABY27y/JleCq r/t3I9FOn3jk8479cAzYTR5rhtG8A6Xhq X-Received: by 2002:a19:f811:: with SMTP id a17mr23461975lff.132.1574759772744; Tue, 26 Nov 2019 01:16:12 -0800 (PST) X-Google-Smtp-Source: APXvYqxi4cxslTGXaPEgklZisShtCL52V7ndFFVsbgvulKaJ2kiSJRyrQs7o0m+akem1uQZYddlS3g== X-Received: by 2002:a19:f811:: with SMTP id a17mr23461957lff.132.1574759772531; Tue, 26 Nov 2019 01:16:12 -0800 (PST) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id s27sm4937135lfc.31.2019.11.26.01.16.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 01:16:11 -0800 (PST) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id DC18D1818BF; Tue, 26 Nov 2019 10:16:10 +0100 (CET) From: Toke =?utf-8?Q?H=C3=B8iland-J=C3=B8rgensen?= To: Dan Carpenter Subject: Re: [PATCH] mt76: Off by one in mt76_calc_rx_airtime() In-Reply-To: <20191126091150.GA1759@kadam> References: <20191121213935.2cbgh3qmd4hv4v5a@kili.mountain> <87v9r7ysg0.fsf@toke.dk> <20191126091150.GA1759@kadam> X-Clacks-Overhead: GNU Terry Pratchett Date: Tue, 26 Nov 2019 10:16:10 +0100 Message-ID: <87h82ryp45.fsf@toke.dk> MIME-Version: 1.0 X-MC-Unique: I-j--IWBNSawGohks0IMlQ-1 X-Mimecast-Spam-Score: 0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191126_011621_035475_8539808C X-CRM114-Status: GOOD ( 17.21 ) 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 , Felix Fietkau Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org RGFuIENhcnBlbnRlciA8ZGFuLmNhcnBlbnRlckBvcmFjbGUuY29tPiB3cml0ZXM6Cgo+IE9uIFR1 ZSwgTm92IDI2LCAyMDE5IGF0IDA5OjA0OjE1QU0gKzAxMDAsIFRva2UgSMO4aWxhbmQtSsO4cmdl bnNlbiB3cm90ZToKPj4gRGFuIENhcnBlbnRlciA8ZGFuLmNhcnBlbnRlckBvcmFjbGUuY29tPiB3 cml0ZXM6Cj4+IAo+PiA+IFRoZSBzYmFuZC0+Yml0cmF0ZXNbXSBhcnJheSBoYXMgInNiYW5kLT5u X2JpdHJhdGVzIiBlbGVtZW50cyBzbyB0aGlzCj4+ID4gY2hlY2sgbmVlZHMgdG8gYmUgPj0gaW5z dGVhZCBvZiA+IG9yIHdlIGNvdWxkIHJlYWQgYmV5b25kIHRoZSBlbmQgb2YgdGhlCj4+ID4gYXJy YXkuCj4+ID4KPj4gPiBUaGVzZSB2YWx1ZXMgY29tZSBmcm9tIHdoZW4gd2UgY2FsbCBtdDc2X3Jl Z2lzdGVyX2RldmljZSgpOgo+PiA+Cj4+ID4gCXJldCA9IG10NzZfcmVnaXN0ZXJfZGV2aWNlKCZk ZXYtPm10NzYsIHRydWUsIG10NzYwM19yYXRlcywKPj4gPiAJCQkJICAgQVJSQVlfU0laRShtdDc2 MDNfcmF0ZXMpKTsKPj4gPgo+PiA+IEhlcmUgc2JhbmQtPmJpdHJhdGVzW10gaXMgbXQ3NjAzX3Jh dGVzW10gYW5kIC0+bl9iaXRyYXRlcyBpcyB0aGUKPj4gPiBBUlJBWV9TSVpFKCkKPj4gPgo+PiA+ IEZpeGVzOiA1Y2UwOWMxYTc5MDcgKCJtdDc2OiB0cmFjayByeCBhaXJ0aW1lIGZvciBhaXJ0aW1l IGZhaXJuZXNzIGFuZCBzdXJ2ZXkiKQo+PiA+IFNpZ25lZC1vZmYtYnk6IERhbiBDYXJwZW50ZXIg PGRhbi5jYXJwZW50ZXJAb3JhY2xlLmNvbT4KPj4gPiAtLS0KPj4gPiAgZHJpdmVycy9uZXQvd2ly ZWxlc3MvbWVkaWF0ZWsvbXQ3Ni9haXJ0aW1lLmMgfCAyICstCj4+ID4gIDEgZmlsZSBjaGFuZ2Vk LCAxIGluc2VydGlvbigrKSwgMSBkZWxldGlvbigtKQo+PiA+Cj4+ID4gZGlmZiAtLWdpdCBhL2Ry aXZlcnMvbmV0L3dpcmVsZXNzL21lZGlhdGVrL210NzYvYWlydGltZS5jIGIvZHJpdmVycy9uZXQv d2lyZWxlc3MvbWVkaWF0ZWsvbXQ3Ni9haXJ0aW1lLmMKPj4gPiBpbmRleCA1NTExNmYzOTVmOWEu LmE0YTc4NTQ2Nzc0OCAxMDA2NDQKPj4gPiAtLS0gYS9kcml2ZXJzL25ldC93aXJlbGVzcy9tZWRp YXRlay9tdDc2L2FpcnRpbWUuYwo+PiA+ICsrKyBiL2RyaXZlcnMvbmV0L3dpcmVsZXNzL21lZGlh dGVrL210NzYvYWlydGltZS5jCj4+ID4gQEAgLTI0Miw3ICsyNDIsNyBAQCB1MzIgbXQ3Nl9jYWxj X3J4X2FpcnRpbWUoc3RydWN0IG10NzZfZGV2ICpkZXYsIHN0cnVjdCBtdDc2X3J4X3N0YXR1cyAq c3RhdHVzLAo+PiA+ICAJCQlyZXR1cm4gMDsKPj4gPiAgCj4+ID4gIAkJc2JhbmQgPSBkZXYtPmh3 LT53aXBoeS0+YmFuZHNbc3RhdHVzLT5iYW5kXTsKPj4gPiAtCQlpZiAoIXNiYW5kIHx8IHN0YXR1 cy0+cmF0ZV9pZHggPiBzYmFuZC0+bl9iaXRyYXRlcykKPj4gPiArCQlpZiAoIXNiYW5kIHx8IHN0 YXR1cy0+cmF0ZV9pZHggPj0gc2JhbmQtPm5fYml0cmF0ZXMpCj4+ID4gIAkJCXJldHVybiAwOwo+ PiA+ICAKPj4gPiAgCQlyYXRlID0gJnNiYW5kLT5iaXRyYXRlc1tzdGF0dXMtPnJhdGVfaWR4XTsK Pj4gCj4+IFRoaXMgY29kZSBoYXMgcmVjZW50bHkgYmVlbiBwb3J0ZWQgdG8gbWFjODAyMTEgKG5l dC9tYWM4MDIxMS9haXJ0aW1lLmMpLgo+PiBJdCBzZWVtcyB0aGF0IHRoZSBidWcgaXMgYWxzbyBw cmVzZW50IHRoZXJlOyBjYXJlIHRvIHNlbmQgYSBwYXRjaCBmb3IKPj4gdGhhdCBhcyB3ZWxsPyA6 KQo+Cj4gT2guICBUaGFua3MgZm9yIHBvaW50aW5nIHRoYXQgb3V0LiAgSSBhY3R1YWxseSBzYXcg dGhlIHN0YXRpYyBjaGVja2VyCj4gd2FybmluZyBmb3IgdGhhdCBhbmQgaWdub3JlZCBpdCB0aGlu a2luZyB0aGF0IGl0IHdhcyB0aGUgc2FtZSBjb2RlLgo+IDpQCgpXZWxsLCBpdCdzIGNvcHktcGFz dGVkIGZyb20gdGhlIHNhbWUgY29kZSA7KQoKVGhlIHBsYW4gaXMgdG8gZ2V0IHJpZCBvZiB0aGUg dmVyc2lvbiBpbnNpZGUgbXQ3Njsgd2FzIHdhaXRpbmcgZm9yIHRoZQp0cmVlcyB0byBjb252ZXJn ZSwgdGhvdWdoLCBzbyBJIGd1ZXNzIGFmdGVyIHRoZSBtZXJnZSB3aW5kb3c/Cgo+IEkgd2lsbCBz ZW5kIGEgZml4IGZvciBpdC4KCkdyZWF0LCB0aGFua3MhCgotVG9rZQoKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkxpbnV4LW1lZGlhdGVrIG1haWxpbmcg bGlzdApMaW51eC1tZWRpYXRla0BsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZy YWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtbWVkaWF0ZWsK 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.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 63F5CC432C0 for ; Tue, 26 Nov 2019 09:16:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 388ED20748 for ; Tue, 26 Nov 2019 09:16:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KPJacqge" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727579AbfKZJQR (ORCPT ); Tue, 26 Nov 2019 04:16:17 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:45667 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727483AbfKZJQR (ORCPT ); Tue, 26 Nov 2019 04:16:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574759775; 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=vb+oxQxZRkNlkuBEQUYVCl/O5AvuVY4nZz95WVzmQq8=; b=KPJacqge+BMAzmRYMzQQJftxDejx2BuTj31hl/rlzH5+X5s2pSvlL2dhZDfIihiWK9Fd9d TrSvHqn6W5mk6j9kC9bcAXwK7SfhLeLSoh0NOTrI6FZMWNWuVTsKFdDS8SrMI3+7tez1Zl YpG7dkiYU4WuEaLF4PfzjXPGEisdOz8= Received: from mail-lf1-f71.google.com (mail-lf1-f71.google.com [209.85.167.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-348-1m40VoXRMT-kk4noMGX22g-1; Tue, 26 Nov 2019 04:16:14 -0500 Received: by mail-lf1-f71.google.com with SMTP id x23so3745772lfc.5 for ; Tue, 26 Nov 2019 01:16:14 -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:content-transfer-encoding; bh=+GixzF/KaQHv0D6//vs+c5ZE/FXLP7KWC/hh8q0IT38=; b=j6HV/1GEbrpfydmtK5ZFDXgbJVRg/qSMwpqugHP+vMIKrN3t8lI5JI1IG5rt1Ri9Cc 2qRfOqwbp4QQYe7MDmVaRkcOV112zQvaQ9aIDUK4yoelTqlrUnSMJe54aghyXmm7C36h LgDgla8Iwzojao/wceXUti8NDlnO8cAZOXj3YnstKfTNJMFYSlHJKaOBRKsReLWMZZUw XIBIYUOWvAURRL1BoR9JJ+lcWJqwgX4px2/wVdTyWikJmRK9FoYPcxNbjttZQgPYJC1V Sd0+NeWjs/soJeT4C08Nzg1boweISTgDn6l4TPaNi3JkexNbGmx5NGBjcYh8u+88oE4Z g4qQ== X-Gm-Message-State: APjAAAUCWN7AQyXplItnkTWTIV5pxkyCxp6b2e9IARTLztFr6loSj/fm QKJKhgrLj0s7Sf4o1diNJlgixmUjiVbRMFytFsQ29QdFI3I+0WMTZKP265SSKd2sf32m1Y/5SDL 7/LuydgZceGLm/uwpTXKYj5weFn4= X-Received: by 2002:a19:f811:: with SMTP id a17mr23461977lff.132.1574759772744; Tue, 26 Nov 2019 01:16:12 -0800 (PST) X-Google-Smtp-Source: APXvYqxi4cxslTGXaPEgklZisShtCL52V7ndFFVsbgvulKaJ2kiSJRyrQs7o0m+akem1uQZYddlS3g== X-Received: by 2002:a19:f811:: with SMTP id a17mr23461957lff.132.1574759772531; Tue, 26 Nov 2019 01:16:12 -0800 (PST) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id s27sm4937135lfc.31.2019.11.26.01.16.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 01:16:11 -0800 (PST) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id DC18D1818BF; Tue, 26 Nov 2019 10:16:10 +0100 (CET) From: Toke =?utf-8?Q?H=C3=B8iland-J=C3=B8rgensen?= To: Dan Carpenter Cc: Felix Fietkau , Lorenzo Bianconi , Ryder Lee , Roy Luo , Kalle Valo , Matthias Brugger , linux-wireless@vger.kernel.org, linux-mediatek@lists.infradead.org, kernel-janitors@vger.kernel.org Subject: Re: [PATCH] mt76: Off by one in mt76_calc_rx_airtime() In-Reply-To: <20191126091150.GA1759@kadam> References: <20191121213935.2cbgh3qmd4hv4v5a@kili.mountain> <87v9r7ysg0.fsf@toke.dk> <20191126091150.GA1759@kadam> X-Clacks-Overhead: GNU Terry Pratchett Date: Tue, 26 Nov 2019 10:16:10 +0100 Message-ID: <87h82ryp45.fsf@toke.dk> MIME-Version: 1.0 X-MC-Unique: 1m40VoXRMT-kk4noMGX22g-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Dan Carpenter writes: > On Tue, Nov 26, 2019 at 09:04:15AM +0100, Toke H=C3=B8iland-J=C3=B8rgense= n wrote: >> Dan Carpenter writes: >>=20 >> > The sband->bitrates[] array has "sband->n_bitrates" elements so this >> > check needs to be >=3D instead of > or we could read beyond the end of= the >> > array. >> > >> > These values come from when we call mt76_register_device(): >> > >> > =09ret =3D mt76_register_device(&dev->mt76, true, mt7603_rates, >> > =09=09=09=09 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/ne= t/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, str= uct mt76_rx_status *status, >> > =09=09=09return 0; >> > =20 >> > =09=09sband =3D dev->hw->wiphy->bands[status->band]; >> > -=09=09if (!sband || status->rate_idx > sband->n_bitrates) >> > +=09=09if (!sband || status->rate_idx >=3D sband->n_bitrates) >> > =09=09=09return 0; >> > =20 >> > =09=09rate =3D &sband->bitrates[status->rate_idx]; >>=20 >> 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? :) > > Oh. Thanks for pointing that out. I actually saw the static checker > warning for that and ignored it thinking that it was the same code. > :P Well, it's copy-pasted from the same code ;) The plan is to get rid of the version inside mt76; was waiting for the trees to converge, though, so I guess after the merge window? > I will send a fix for it. Great, thanks! -Toke