2019-02-20 09:20:58

by Lorenzo Bianconi

Subject: [PATCH] mt76: usb: check urb->num_sgs limit in mt76u_process_rx_entry

From: Lorenzo Bianconi <[email protected]>

check nsgs value is less than urb->num_sgs in mt76u_process_rx_entry
in order to avoid an out-of-bound access of urb->sg array

Signed-off-by: Lorenzo Bianconi <[email protected]>
---
drivers/net/wireless/mediatek/mt76/usb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/mediatek/mt76/usb.c b/drivers/net/wireless/mediatek/mt76/usb.c
index 78191968b4fa..5d7b57827d1e 100644
--- a/drivers/net/wireless/mediatek/mt76/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/usb.c
@@ -464,7 +464,7 @@ mt76u_process_rx_entry(struct mt76_dev *dev, struct mt76u_buf *buf)
__skb_put(skb, data_len);
len -= data_len;

- while (len > 0 && urb->num_sgs) {
+ while (len > 0 && nsgs < urb->num_sgs) {
data_len = min_t(int, len, urb->sg[nsgs].length);
skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,
sg_page(&urb->sg[nsgs]),
--
2.20.1

2019-02-26 11:33:29

by Felix Fietkau

Subject: Re: [PATCH] mt76: usb: check urb->num_sgs limit in mt76u_process_rx_entry

On 2019-02-20 10:20, [email protected] wrote:
> From: Lorenzo Bianconi <[email protected]>
>
> check nsgs value is less than urb->num_sgs in mt76u_process_rx_entry
> in order to avoid an out-of-bound access of urb->sg array
>
> Signed-off-by: Lorenzo Bianconi <[email protected]>
Applied, thanks.

- Felix