Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29eca8b7 authored by Polaris Pi's avatar Polaris Pi Committed by Greg Kroah-Hartman
Browse files

wifi: mwifiex: Fix OOB and integer underflow when rx packets 



[ Upstream commit 11958528161731c58e105b501ed60b83a91ea941 ]

Make sure mwifiex_process_mgmt_packet,
mwifiex_process_sta_rx_packet and mwifiex_process_uap_rx_packet,
mwifiex_uap_queue_bridged_pkt and mwifiex_process_rx_packet
not out-of-bounds access the skb->data buffer.

Fixes: 2dbaf751 ("mwifiex: report received management frames to cfg80211")
Signed-off-by: default avatarPolaris Pi <pinkperfect2021@gmail.com>
Reviewed-by: default avatarMatthew Wang <matthewmwang@chromium.org>
Reviewed-by: default avatarBrian Norris <briannorris@chromium.org>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230723070741.1544662-1-pinkperfect2021@gmail.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 042aeb45

drivers/net/wireless/marvell/mwifiex/sta_rx.c

+10 −1
Original line number Diff line number Diff line
@@ -98,6 +98,14 @@ int mwifiex_process_rx_packet(struct mwifiex_private *priv, 
	rx_pkt_len = le16_to_cpu(local_rx_pd->rx_pkt_length);

	rx_pkt_hdr = (void *)local_rx_pd + rx_pkt_off;



	if (sizeof(*rx_pkt_hdr) + rx_pkt_off > skb->len) {

		mwifiex_dbg(priv->adapter, ERROR,

			    "wrong rx packet offset: len=%d, rx_pkt_off=%d\n",

			    skb->len, rx_pkt_off);

		priv->stats.rx_dropped++;

		dev_kfree_skb_any(skb);

	}



	if ((!memcmp(&rx_pkt_hdr->rfc1042_hdr, bridge_tunnel_header,

		     sizeof(bridge_tunnel_header))) ||

	    (!memcmp(&rx_pkt_hdr->rfc1042_hdr, rfc1042_header,
@@ -206,7 +214,8 @@ int mwifiex_process_sta_rx_packet(struct mwifiex_private *priv, 


	rx_pkt_hdr = (void *)local_rx_pd + rx_pkt_offset;



	if ((rx_pkt_offset + rx_pkt_length) > (u16) skb->len) {

	if ((rx_pkt_offset + rx_pkt_length) > skb->len ||

	    sizeof(rx_pkt_hdr->eth803_hdr) + rx_pkt_offset > skb->len) {

		mwifiex_dbg(adapter, ERROR,

			    "wrong rx packet: len=%d, rx_pkt_offset=%d, rx_pkt_length=%d\n",

			    skb->len, rx_pkt_offset, rx_pkt_length);

drivers/net/wireless/marvell/mwifiex/uap_txrx.c

+19 −0
Original line number Diff line number Diff line
@@ -115,6 +115,15 @@ static void mwifiex_uap_queue_bridged_pkt(struct mwifiex_private *priv, 
		return;

	}



	if (sizeof(*rx_pkt_hdr) +

	    le16_to_cpu(uap_rx_pd->rx_pkt_offset) > skb->len) {

		mwifiex_dbg(adapter, ERROR,

			    "wrong rx packet offset: len=%d,rx_pkt_offset=%d\n",

			    skb->len, le16_to_cpu(uap_rx_pd->rx_pkt_offset));

		priv->stats.rx_dropped++;

		dev_kfree_skb_any(skb);

	}



	if ((!memcmp(&rx_pkt_hdr->rfc1042_hdr, bridge_tunnel_header,

		     sizeof(bridge_tunnel_header))) ||

	    (!memcmp(&rx_pkt_hdr->rfc1042_hdr, rfc1042_header,
@@ -383,6 +392,16 @@ int mwifiex_process_uap_rx_packet(struct mwifiex_private *priv, 
	rx_pkt_type = le16_to_cpu(uap_rx_pd->rx_pkt_type);

	rx_pkt_hdr = (void *)uap_rx_pd + le16_to_cpu(uap_rx_pd->rx_pkt_offset);



	if (le16_to_cpu(uap_rx_pd->rx_pkt_offset) +

	    sizeof(rx_pkt_hdr->eth803_hdr) > skb->len) {

		mwifiex_dbg(adapter, ERROR,

			    "wrong rx packet for struct ethhdr: len=%d, offset=%d\n",

			    skb->len, le16_to_cpu(uap_rx_pd->rx_pkt_offset));

		priv->stats.rx_dropped++;

		dev_kfree_skb_any(skb);

		return 0;

	}



	ether_addr_copy(ta, rx_pkt_hdr->eth803_hdr.h_source);



	if ((le16_to_cpu(uap_rx_pd->rx_pkt_offset) +

drivers/net/wireless/marvell/mwifiex/util.c

+7 −3
Original line number Diff line number Diff line
@@ -405,11 +405,15 @@ mwifiex_process_mgmt_packet(struct mwifiex_private *priv, 
	}



	rx_pd = (struct rxpd *)skb->data;

	pkt_len = le16_to_cpu(rx_pd->rx_pkt_length);

	if (pkt_len < sizeof(struct ieee80211_hdr) + sizeof(pkt_len)) {

		mwifiex_dbg(priv->adapter, ERROR, "invalid rx_pkt_length");

		return -1;

	}



	skb_pull(skb, le16_to_cpu(rx_pd->rx_pkt_offset));

	skb_pull(skb, sizeof(pkt_len));



	pkt_len = le16_to_cpu(rx_pd->rx_pkt_length);

	pkt_len -= sizeof(pkt_len);



	ieee_hdr = (void *)skb->data;

	if (ieee80211_is_mgmt(ieee_hdr->frame_control)) {
@@ -422,7 +426,7 @@ mwifiex_process_mgmt_packet(struct mwifiex_private *priv, 
		skb->data + sizeof(struct ieee80211_hdr),

		pkt_len - sizeof(struct ieee80211_hdr));



	pkt_len -= ETH_ALEN + sizeof(pkt_len);

	pkt_len -= ETH_ALEN;

	rx_pd->rx_pkt_length = cpu_to_le16(pkt_len);



	cfg80211_rx_mgmt(&priv->wdev, priv->roc_cfg.chan.center_freq,