wifi: mwifiex: Fix missed return in oob checks failed path
authorPolaris Pi <pinkperfect2021@gmail.com>
Thu, 10 Aug 2023 08:39:11 +0000 (08:39 +0000)
committerKalle Valo <kvalo@kernel.org>
Mon, 21 Aug 2023 15:57:39 +0000 (18:57 +0300)
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
drivers/net/wireless/marvell/mwifiex/sta_rx.c
drivers/net/wireless/marvell/mwifiex/uap_txrx.c

index f2899d5..65420ad 100644 (file)
@@ -92,6 +92,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,
index caff442..b9866f2 100644 (file)
@@ -110,6 +110,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,