Commit df1753ea authored Aug 10, 2023 by Polaris Pi Committed by Greg Kroah-Hartman Sep 23, 2023

wifi: mwifiex: Fix missed return in oob checks failed path



[ Upstream commit 2785851c627f2db05f9271f7f63661b5dbd95c4c ]

Add missed return in mwifiex_uap_queue_bridged_pkt() and
mwifiex_process_rx_packet().

Fixes: 119585281617 ("wifi: mwifiex: Fix OOB and integer underflow when rx packets")
Signed-off-by: Polaris Pi <pinkperfect2021@gmail.com>
Reported-by: Dmitry Antipov <dmantipov@yandex.ru>
Acked-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230810083911.3725248-1-pinkperfect2021@gmail.com


Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 8f717752

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -104,6 +104,7 @@ int mwifiex_process_rx_packet(struct mwifiex_private *priv,
		skb->len, rx_pkt_off);
		priv->stats.rx_dropped++;
		dev_kfree_skb_any(skb);
		return -1;
		}

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

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -122,6 +122,7 @@ static void mwifiex_uap_queue_bridged_pkt(struct mwifiex_private *priv,
		skb->len, le16_to_cpu(uap_rx_pd->rx_pkt_offset));
		priv->stats.rx_dropped++;
		dev_kfree_skb_any(skb);
		return;
		}

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