Skip to content

Commit baba026

Browse files
wifi: mwifiex: Fix missed return in oob checks failed path
jira VULN-154525 cve-bf CVE-2023-53226 commit-author Polaris Pi <[email protected]> commit 2785851 Add missed return in mwifiex_uap_queue_bridged_pkt() and mwifiex_process_rx_packet(). Fixes: 1195852 ("wifi: mwifiex: Fix OOB and integer underflow when rx packets") Signed-off-by: Polaris Pi <[email protected]> Reported-by: Dmitry Antipov <[email protected]> Acked-by: Brian Norris <[email protected]> Signed-off-by: Kalle Valo <[email protected]> Link: https://lore.kernel.org/r/[email protected] (cherry picked from commit 2785851) Signed-off-by: Shreeya Patel <[email protected]>
1 parent f58691d commit baba026

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ int mwifiex_process_rx_packet(struct mwifiex_private *priv,
9393
skb->len, rx_pkt_off);
9494
priv->stats.rx_dropped++;
9595
dev_kfree_skb_any(skb);
96+
return -1;
9697
}
9798

9899
if (sizeof(*rx_pkt_hdr) + rx_pkt_off <= skb->len &&

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ static void mwifiex_uap_queue_bridged_pkt(struct mwifiex_private *priv,
110110
skb->len, le16_to_cpu(uap_rx_pd->rx_pkt_offset));
111111
priv->stats.rx_dropped++;
112112
dev_kfree_skb_any(skb);
113+
return;
113114
}
114115

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

0 commit comments

Comments
 (0)