From: Kalle Valo <kvalo@qca.qualcomm.com>
To: Raja Mani <rmani@qti.qualcomm.com>
Cc: <linux-wireless@vger.kernel.org>, <ath10k@lists.infradead.org>
Subject: Re: [PATCH v2 1/8] ath10k: enhance swba event handler to adapt different size tim bitmap
Date: Wed, 1 Jul 2015 13:28:47 +0300 [thread overview]
Message-ID: <87d20cxjc0.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <87h9poxjvs.fsf@kamboji.qca.qualcomm.com> (Kalle Valo's message of "Wed, 1 Jul 2015 13:16:55 +0300")
Kalle Valo <kvalo@qca.qualcomm.com> writes:
>> /* if next SWBA has no tim_changed the tim_bitmap is garbage.
>> * we must copy the bitmap upon change and reuse it later */
>> if (__le32_to_cpu(tim_info->tim_changed)) {
>> int i;
>>
>> - BUILD_BUG_ON(sizeof(arvif->u.ap.tim_bitmap) !=
>> - sizeof(tim_info->tim_bitmap));
>> + WARN_ON(sizeof(arvif->u.ap.tim_bitmap) < tim_len);
>
> I'm worried that this WARN_ON() spams too much so I changed it to:
>
> --- a/drivers/net/wireless/ath/ath10k/wmi.c
> +++ b/drivers/net/wireless/ath/ath10k/wmi.c
> @@ -2893,7 +2893,7 @@ static void ath10k_wmi_update_tim(struct ath10k *ar,
> if (__le32_to_cpu(tim_info->tim_changed)) {
> int i;
>
> - WARN_ON(sizeof(arvif->u.ap.tim_bitmap) < tim_len);
> + WARN_ON_ONCE(sizeof(arvif->u.ap.tim_bitmap) < tim_len);
>
> for (i = 0; i < tim_len; i++) {
> t = tim_info->tim_bitmap[i / 4];
Actually I got more worried about this. If tim_len >
sizeof(arvif->u.ap.tim_bitmap) don't we read out of bounds? So we should
actually add return for that case or am I missing something?
Full code:
WARN_ON_ONCE(sizeof(arvif->u.ap.tim_bitmap) < tim_len);
for (i = 0; i < tim_len; i++) {
t = tim_info->tim_bitmap[i / 4];
v = __le32_to_cpu(t);
arvif->u.ap.tim_bitmap[i] = (v >> ((i % 4) * 8)) & 0xFF;
}
--
Kalle Valo
next prev parent reply other threads:[~2015-07-01 10:28 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-22 14:52 [PATCH v2 0/8] add beacon and htt msg support for 10.4 firmware Raja Mani
2015-06-22 14:52 ` [PATCH v2 1/8] ath10k: enhance swba event handler to adapt different size tim bitmap Raja Mani
2015-07-01 10:16 ` Kalle Valo
2015-07-01 10:21 ` rmani
2015-07-01 10:28 ` Kalle Valo [this message]
2015-07-01 11:18 ` Kalle Valo
2015-06-22 14:52 ` [PATCH v2 2/8] ath10k: handle 10.4 firmware wmi swba event Raja Mani
2015-06-22 14:52 ` [PATCH v2 3/8] ath10k: enable vdev and peer related operations for 10.4 fw Raja Mani
2015-06-22 14:52 ` [PATCH v2 4/8] ath10k: add scan support " Raja Mani
2015-06-22 14:52 ` [PATCH v2 5/8] ath10k: add 10.4 fw specific htt msg definitions Raja Mani
2015-07-01 10:38 ` Kalle Valo
2015-07-01 11:46 ` rmani
2015-06-22 14:52 ` [PATCH v2 6/8] ath10k: advertise 10.4 fw ap and sta iface combination to mac80211 Raja Mani
2015-06-22 14:52 ` [PATCH v2 7/8] ath10k: set max spatial stream to 4 for 10.4 fw Raja Mani
2015-06-22 14:52 ` [PATCH v2 8/8] ath10k: configure frag desc memory to target for qca99X0 Raja Mani
2015-06-22 23:41 ` Peter Oh
2015-06-23 5:48 ` rmani
2015-07-02 5:50 ` [PATCH v2 0/8] add beacon and htt msg support for 10.4 firmware 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=87d20cxjc0.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@qca.qualcomm.com \
--cc=ath10k@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=rmani@qti.qualcomm.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).