From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
To: Johannes Berg <johannes@sipsolutions.net>,
Kalle Valo <kvalo@kernel.org>,
Jeff Johnson <quic_jjohnson@quicinc.com>
Cc: ath10k@lists.infradead.org, linux-wireless@vger.kernel.org,
linux-kernel@vger.kernel.org,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
linux-hardening@vger.kernel.org
Subject: Re: [RFC - is this a bug?] wifi: ath10k: Asking for some light on this, please :)
Date: Tue, 24 Oct 2023 20:37:31 -0600 [thread overview]
Message-ID: <8219c79e-0359-4136-afa4-fba76fde191a@embeddedor.com> (raw)
In-Reply-To: <f8daa53ee8a8019e4fd2b823c1fcb85a6cc4d806.camel@sipsolutions.net>
On 10/24/23 14:49, Johannes Berg wrote:
> On Tue, 2023-10-24 at 14:41 -0600, Gustavo A. R. Silva wrote:
>>
>> It seems we run into the same issue in the function below, even in the
>> case this `memset()` is unnecessary (which it seems it's not):
>>
>> 8920 memset(skb->data, 0, sizeof(*cmd));
>>
>> Notice that if `cap->peer_chan_len == 0` or `cap->peer_chan_len == 1`,
>> in the original code, we have `len == sizeof(*cmd) == 128`:
>
> Right.
>
>> - /* tdls peer update cmd has place holder for one channel*/
>> - chan_len = cap->peer_chan_len ? (cap->peer_chan_len - 1) : 0;
>> -
>> - len = sizeof(*cmd) + chan_len * sizeof(*chan);
>> + len = struct_size(cmd, peer_capab.peer_chan_list, cap->peer_chan_len);
>>
>> skb = ath10k_wmi_alloc_skb(ar, len);
>> if (!skb)
>>
>> which makes `round_len == roundup(len, 4) == struct_size(cmd,...,...) == 104`
>> when `cap->peer_chan_len == 0`
>
> And yeah, that's really the issue, it only matters for ==0. For a moment
> there I thought that doesn't even make sense, but it looks like it never
> even becomes non-zero.
>
> No idea then, sorry. You'd hope firmware doesn't care about the actual
> message size if the inner data says "0 entries", but who knows? And how
> many firmware versions are there? :)
>
> So I guess you'd want to stay compatible, even if it means having a
>
> chan_len = min(cap->peer_chan_len, 1);
>
> for the struct_size()?
Yeah, that's an alternative.
I'll wait for the maintainers to chime in and see if they have a different
opinion.
Thanks
--
Gustavo
next prev parent reply other threads:[~2023-10-25 2:37 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-24 19:50 [RFC - is this a bug?] wifi: ath10k: Asking for some light on this, please :) Gustavo A. R. Silva
2023-10-24 20:11 ` Johannes Berg
2023-10-24 20:41 ` Gustavo A. R. Silva
2023-10-24 20:49 ` Johannes Berg
2023-10-25 2:37 ` Gustavo A. R. Silva [this message]
2023-10-25 15:52 ` Jeff Johnson
2023-12-12 23:26 ` Jeff Johnson
2023-10-25 1:06 ` Gustavo A. R. Silva
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=8219c79e-0359-4136-afa4-fba76fde191a@embeddedor.com \
--to=gustavo@embeddedor.com \
--cc=ath10k@lists.infradead.org \
--cc=gustavoars@kernel.org \
--cc=johannes@sipsolutions.net \
--cc=kvalo@kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=quic_jjohnson@quicinc.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