linux-mediatek.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: "Toke Høiland-Jørgensen" <toke@redhat.com>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Ryder Lee <ryder.lee@mediatek.com>,
	kernel-janitors@vger.kernel.org, linux-wireless@vger.kernel.org,
	Matthias Brugger <matthias.bgg@gmail.com>,
	linux-mediatek@lists.infradead.org, Roy Luo <royluo@google.com>,
	Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>,
	Kalle Valo <kvalo@codeaurora.org>, Felix Fietkau <nbd@nbd.name>
Subject: Re: [PATCH] mt76: Off by one in mt76_calc_rx_airtime()
Date: Tue, 26 Nov 2019 10:16:10 +0100	[thread overview]
Message-ID: <87h82ryp45.fsf@toke.dk> (raw)
In-Reply-To: <20191126091150.GA1759@kadam>

Dan Carpenter <dan.carpenter@oracle.com> writes:

> On Tue, Nov 26, 2019 at 09:04:15AM +0100, Toke Høiland-Jørgensen wrote:
>> Dan Carpenter <dan.carpenter@oracle.com> 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 <dan.carpenter@oracle.com>
>> > ---
>> >  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


_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek

  reply	other threads:[~2019-11-26  9:16 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-26  4:49 [PATCH] mt76: Off by one in mt76_calc_rx_airtime() Dan Carpenter
2019-11-26  5:21 ` Kalle Valo
2019-11-26  5:25 ` Markus Theil
2019-11-26  8:04 ` Toke Høiland-Jørgensen
2019-11-26  9:11   ` Dan Carpenter
2019-11-26  9:16     ` Toke Høiland-Jørgensen [this message]
2019-11-26  9:23       ` Kalle Valo
2019-11-26 12:09   ` [PATCH] mac80211: airtime: Fix an off by one in ieee80211_calc_rx_airtime() Dan Carpenter
2019-11-26 12:39     ` Toke Høiland-Jørgensen
2019-12-18 18:51 ` [PATCH] mt76: Off by one in mt76_calc_rx_airtime() Kalle Valo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87h82ryp45.fsf@toke.dk \
    --to=toke@redhat.com \
    --cc=dan.carpenter@oracle.com \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=kvalo@codeaurora.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=lorenzo.bianconi83@gmail.com \
    --cc=matthias.bgg@gmail.com \
    --cc=nbd@nbd.name \
    --cc=royluo@google.com \
    --cc=ryder.lee@mediatek.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).