From: Kalle Valo <kvalo@qca.qualcomm.com>
To: Michal Kazior <michal.kazior@tieto.com>
Cc: <ath10k@lists.infradead.org>, <linux-wireless@vger.kernel.org>
Subject: Re: [PATCH 2/2] ath10k: sanitize tx ring index access properly
Date: Mon, 14 Jul 2014 16:20:08 +0300 [thread overview]
Message-ID: <87vbr0krg7.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <1401954520-3365-3-git-send-email-michal.kazior@tieto.com> (Michal Kazior's message of "Thu, 5 Jun 2014 09:48:40 +0200")
Michal Kazior <michal.kazior@tieto.com> writes:
> The tx ring index was immediately trimmed with a
> bitmask. This discarded the 0xFFFFFFFF error case
> (which theoretically can happen when a device is
> abruptly disconnected) and led to using an invalid
> tx ring index. This could lead to memory
> corruption.
>
> Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
> ---
> drivers/net/wireless/ath/ath10k/ce.c | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath10k/ce.c b/drivers/net/wireless/ath/ath10k/ce.c
> index d185dc0..7c6c7d5 100644
> --- a/drivers/net/wireless/ath/ath10k/ce.c
> +++ b/drivers/net/wireless/ath/ath10k/ce.c
> @@ -603,16 +603,19 @@ static int ath10k_ce_completed_send_next_nolock(struct ath10k_ce_pipe *ce_state,
> if (ret)
> return ret;
>
> - src_ring->hw_index =
> - ath10k_ce_src_ring_read_index_get(ar, ctrl_addr);
> - src_ring->hw_index &= nentries_mask;
> + read_index = ath10k_ce_src_ring_read_index_get(ar, ctrl_addr);
> + if (read_index == 0xFFFFFFFF)
> + return -ENODEV;
I changed this to lower case, as it was before. Let's use lower case hex
values in ath10k.
--
Kalle Valo
next prev parent reply other threads:[~2014-07-14 13:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-05 7:48 [PATCH 0/2] ath10k: pci fixes 2014-06-05 Michal Kazior
2014-06-05 7:48 ` [PATCH 1/2] ath10k: fix bmi exchange tx/rx race Michal Kazior
2014-06-05 7:48 ` [PATCH 2/2] ath10k: sanitize tx ring index access properly Michal Kazior
2014-07-14 13:20 ` Kalle Valo [this message]
2014-07-15 8:22 ` [PATCH 0/2] ath10k: pci fixes 2014-06-05 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=87vbr0krg7.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@qca.qualcomm.com \
--cc=ath10k@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=michal.kazior@tieto.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).