Commit bfabdd69 authored Apr 15, 2019 by Gustavo A. R. Silva Committed by Kalle Valo Apr 29, 2019

wil6210: fix potential out-of-bounds read



Notice that *rc* can evaluate to up to 5, include/linux/netdevice.h:

enum gro_result {
        GRO_MERGED,
        GRO_MERGED_FREE,
        GRO_HELD,
        GRO_NORMAL,
        GRO_DROP,
        GRO_CONSUMED,
};
typedef enum gro_result gro_result_t;

In case *rc* evaluates to 5, we end up having an out-of-bounds read
at drivers/net/wireless/ath/wil6210/txrx.c:821:

	wil_dbg_txrx(wil, "Rx complete %d bytes => %s\n",
		     len, gro_res_str[rc]);

Fix this by adding element "GRO_CONSUMED" to array gro_res_str.

Addresses-Coverity-ID: 1444666 ("Out-of-bounds read")
Fixes: 194b482b ("wil6210: Debug print GRO Rx result")
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Reviewed-by: Maya Erez <merez@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

parent d8792393

drivers/net/wireless/ath/wil6210/txrx.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -750,6 +750,7 @@ void wil_netif_rx_any(struct sk_buff skb, struct net_device ndev)
		[GRO_HELD] = "GRO_HELD",
		[GRO_NORMAL] = "GRO_NORMAL",
		[GRO_DROP] = "GRO_DROP",
		[GRO_CONSUMED] = "GRO_CONSUMED",
		};

		wil->txrx_ops.get_netif_rx_params(skb, &cid, &security);

Admin message