Merge tag 'v4.4.214' into 10

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / net / wireless / mwifiex / wmm.c

diff --git a/drivers/net/wireless/mwifiex/wmm.c b/drivers/net/wireless/mwifiex/wmm.c
index 7015dfa..3a2ecb6 100644 (file)
--- a/drivers/net/wireless/mwifiex/wmm.c
+++ b/drivers/net/wireless/mwifiex/wmm.c
@@ -978,6 +978,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);