]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fix the build on 4.4 and 4.9
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 19 Sep 2019 16:32:20 +0000 (18:32 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 19 Sep 2019 16:32:20 +0000 (18:32 +0200)
queue-4.4/mwifiex-fix-three-heap-overflow-at-parsing-element-in-cfg80211_ap_settings.patch
queue-4.9/mwifiex-fix-three-heap-overflow-at-parsing-element-in-cfg80211_ap_settings.patch

index 3f398de1618bcfbf8f9703db4e059f7708a5b028..e72270983f43d0d7e9954fcacb9bdf154662c0d8 100644 (file)
@@ -66,7 +66,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                                            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));
index 9f5418b339e3d794897356872909df9ba6196ab9..c4496824187f038575c2b89b1136ba97b4e6b389 100644 (file)
@@ -66,7 +66,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                                            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));