From: Pkshih <pkshih@realtek.com>
To: Len Baker <len.baker@gmx.com>,
Yan-Hsuan Chuang <tony0620emma@gmail.com>,
Kalle Valo <kvalo@codeaurora.org>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: Stanislaw Gruszka <sgruszka@redhat.com>,
Brian Norris <briannorris@chromium.org>,
"linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"stable@vger.kernel.org" <stable@vger.kernel.org>
Subject: RE: [PATCH] rtw88: Fix out-of-bounds write
Date: Mon, 12 Jul 2021 01:43:16 +0000 [thread overview]
Message-ID: <b0811e08c4a04d2093f3251c55c0edb8@realtek.com> (raw)
In-Reply-To: <20210711141634.6133-1-len.baker@gmx.com>
> -----Original Message-----
> From: Len Baker [mailto:len.baker@gmx.com]
> Sent: Sunday, July 11, 2021 10:17 PM
> To: Yan-Hsuan Chuang; Kalle Valo; David S. Miller; Jakub Kicinski
> Cc: Len Baker; Stanislaw Gruszka; Brian Norris; linux-wireless@vger.kernel.org; netdev@vger.kernel.org;
> linux-kernel@vger.kernel.org; stable@vger.kernel.org
> Subject: [PATCH] rtw88: Fix out-of-bounds write
>
> In the rtw_pci_init_rx_ring function the "if (len > TRX_BD_IDX_MASK)"
> statement guarantees that len is less than or equal to GENMASK(11, 0) or
> in other words that len is less than or equal to 4095. However the
> rx_ring->buf has a size of RTK_MAX_RX_DESC_NUM (defined as 512). This
> way it is possible an out-of-bounds write in the for statement due to
> the i variable can exceed the rx_ring->buff size.
>
> Fix it using the ARRAY_SIZE macro.
>
> Cc: stable@vger.kernel.org
> Addresses-Coverity-ID: 1461515 ("Out-of-bounds write")
> Fixes: e3037485c68ec ("rtw88: new Realtek 802.11ac driver")
> Signed-off-by: Len Baker <len.baker@gmx.com>
> ---
> drivers/net/wireless/realtek/rtw88/pci.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/realtek/rtw88/pci.c b/drivers/net/wireless/realtek/rtw88/pci.c
> index e7d17ab8f113..b9d8c049e776 100644
> --- a/drivers/net/wireless/realtek/rtw88/pci.c
> +++ b/drivers/net/wireless/realtek/rtw88/pci.c
> @@ -280,7 +280,7 @@ static int rtw_pci_init_rx_ring(struct rtw_dev *rtwdev,
I think "if (len > TRX_BD_IDX_MASK)" you mentioned is
if (len > TRX_BD_IDX_MASK) {
rtw_err(rtwdev, "len %d exceeds maximum RX entries\n", len);
return -EINVAL;
}
This statement is used to ensure the length doesn't exceed hardware capability.
To prevent the 'len' argument from exceeding the array size of rx_ring->buff, I
suggest to add another checking statement, like
if (len > ARRAY_SIZE(rx_ring->buf)) {
rtw_err(rtwdev, "len %d exceeds maximum RX ring buffer\n", len);
return -EINVAL;
}
But, I wonder if this a false alarm because 'len' is equal to ARRAY_SIZE(rx_ring->buf)
for now.
> }
> rx_ring->r.head = head;
>
> - for (i = 0; i < len; i++) {
> + for (i = 0; i < ARRAY_SIZE(rx_ring->buf); i++) {
> skb = dev_alloc_skb(buf_sz);
> if (!skb) {
> allocated = i;
> --
> 2.25.1
--
Ping-Ke
next prev parent reply other threads:[~2021-07-12 1:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-11 14:16 [PATCH] rtw88: Fix out-of-bounds write Len Baker
2021-07-12 1:43 ` Pkshih [this message]
2021-07-12 18:38 ` Brian Norris
2021-07-16 15:08 ` Len Baker
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=b0811e08c4a04d2093f3251c55c0edb8@realtek.com \
--to=pkshih@realtek.com \
--cc=briannorris@chromium.org \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=kvalo@codeaurora.org \
--cc=len.baker@gmx.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sgruszka@redhat.com \
--cc=stable@vger.kernel.org \
--cc=tony0620emma@gmail.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).