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>

diff --git a/drivers/net/wireless/marvell/mwifiex/sta_rx.c b/drivers/net/wireless/marvell/mwifiex/sta_rx.c
index a3d716a215ef253042c0a1b98449b73d68db8fd6..f3c6daeba1b852a182c6b88bbc9a741670cbde54 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/sta_rx.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_rx.c
@@ -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,

diff --git a/drivers/net/wireless/marvell/mwifiex/uap_txrx.c b/drivers/net/wireless/marvell/mwifiex/uap_txrx.c
index 09243e6d8ba9a69beb10644d4c7c48c54421e732..90c07722c25f8af189e89561dadb0cd61ffc975f 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/uap_txrx.c
+++ b/drivers/net/wireless/marvell/mwifiex/uap_txrx.c
@@ -123,6 +123,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,