From: Greg Kroah-Hartman Date: Thu, 19 Sep 2019 16:32:20 +0000 (+0200) Subject: fix the build on 4.4 and 4.9 X-Git-Tag: v4.4.194~28 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0545399fb273ae2198c3f8116ed89450e093a316;p=thirdparty%2Fkernel%2Fstable-queue.git fix the build on 4.4 and 4.9 --- diff --git a/queue-4.4/mwifiex-fix-three-heap-overflow-at-parsing-element-in-cfg80211_ap_settings.patch b/queue-4.4/mwifiex-fix-three-heap-overflow-at-parsing-element-in-cfg80211_ap_settings.patch index 3f398de1618..e72270983f4 100644 --- a/queue-4.4/mwifiex-fix-three-heap-overflow-at-parsing-element-in-cfg80211_ap_settings.patch +++ b/queue-4.4/mwifiex-fix-three-heap-overflow-at-parsing-element-in-cfg80211_ap_settings.patch @@ -66,7 +66,7 @@ Signed-off-by: Greg Kroah-Hartman params->beacon.tail_len); if (vendor_ie) { wmm_ie = (struct ieee_types_header *)vendor_ie; -+ if (*(wmm_ie + 1) > sizeof(struct mwifiex_types_wmm_info)) ++ if (*(vendor_ie + 1) > sizeof(struct mwifiex_types_wmm_info)) + return; memcpy(&bss_cfg->wmm_info, wmm_ie + 1, sizeof(bss_cfg->wmm_info)); diff --git a/queue-4.9/mwifiex-fix-three-heap-overflow-at-parsing-element-in-cfg80211_ap_settings.patch b/queue-4.9/mwifiex-fix-three-heap-overflow-at-parsing-element-in-cfg80211_ap_settings.patch index 9f5418b339e..c4496824187 100644 --- a/queue-4.9/mwifiex-fix-three-heap-overflow-at-parsing-element-in-cfg80211_ap_settings.patch +++ b/queue-4.9/mwifiex-fix-three-heap-overflow-at-parsing-element-in-cfg80211_ap_settings.patch @@ -66,7 +66,7 @@ Signed-off-by: Greg Kroah-Hartman params->beacon.tail_len); if (vendor_ie) { wmm_ie = (struct ieee_types_header *)vendor_ie; -+ if (*(wmm_ie + 1) > sizeof(struct mwifiex_types_wmm_info)) ++ if (*(vendor_ie + 1) > sizeof(struct mwifiex_types_wmm_info)) + return; memcpy(&bss_cfg->wmm_info, wmm_ie + 1, sizeof(bss_cfg->wmm_info));