diff mbox series

[1/2] mwifiex: Fix possible buffer overflows in mwifiex_ret_wmm_get_status()

Message ID 20200102023927.4687-2-m1s5p6688@gmail.com (mailing list archive)
State Accepted
Commit 3a9b153c5591548612c3955c9600a98150c81875
Delegated to: Kalle Valo
Headers show
Series Fix two possible Buffer overflow in mwifiex | expand

Commit Message

m1s5p6688@gmail.com Jan. 2, 2020, 2:39 a.m. UTC 
From: Qing Xu <m1s5p6688@gmail.com>

mwifiex_ret_wmm_get_status() calls memcpy() without checking the 
destination size.Since the source is given from remote AP which 
contains illegal wmm elements , this may trigger a heap buffer 
overflow.
Fix it by putting the length check before calling memcpy().

Signed-off-by: Qing Xu <m1s5p6688@gmail.com>
---
 drivers/net/wireless/marvell/mwifiex/wmm.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Kalle Valo Jan. 27, 2020, 2:34 p.m. UTC | #1 
m1s5p6688@gmail.com wrote:

> From: Qing Xu <m1s5p6688@gmail.com>
> 
> mwifiex_ret_wmm_get_status() calls memcpy() without checking the 
> destination size.Since the source is given from remote AP which 
> contains illegal wmm elements , this may trigger a heap buffer 
> overflow.
> Fix it by putting the length check before calling memcpy().
> 
> Signed-off-by: Qing Xu <m1s5p6688@gmail.com>

2 patches applied to wireless-drivers.git, thanks.

3a9b153c5591 mwifiex: Fix possible buffer overflows in mwifiex_ret_wmm_get_status()
b70261a288ea mwifiex: Fix possible buffer overflows in mwifiex_cmd_append_vsie_tlv()
diff mbox series

Patch

diff --git a/drivers/net/wireless/marvell/mwifiex/wmm.c b/drivers/net/wireless/marvell/mwifiex/wmm.c
index 41f023137..132f9e8ed 100644
--- a/drivers/net/wireless/marvell/mwifiex/wmm.c
+++ b/drivers/net/wireless/marvell/mwifiex/wmm.c
@@ -970,6 +970,10 @@  int mwifiex_ret_wmm_get_status(struct mwifiex_private *priv,
 				    "WMM Parameter Set Count: %d\n",
 				    wmm_param_ie->qos_info_bitmap & mask);
 
+			if (wmm_param_ie->vend_hdr.len + 2 >
+				sizeof(struct ieee_types_wmm_parameter))
+				break;
+
 			memcpy((u8 *) &priv->curr_bss_params.bss_descriptor.
 			       wmm_ie, wmm_param_ie,
 			       wmm_param_ie->vend_hdr.len + 2);