Home Home > GIT Browse > openSUSE-15.0
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-07-15 17:25:44 +0200
committerTakashi Iwai <tiwai@suse.de>2019-07-15 17:25:44 +0200
commit304447b4ff385547a3295322c5683104453b1fe8 (patch)
tree7a8cf41cc55cc4b2154f0535554f7b0a44087e50
parent69fc49874965b722f5c82f059980c5627a6d8104 (diff)
Fix kABI breakage by mwifiex security fix
(CVE-2019-3846,bsc#1136424).
-rw-r--r--patches.kabi/mwifiex-ieee-types-kabi-fix.patch56
-rw-r--r--series.conf1
2 files changed, 57 insertions, 0 deletions
diff --git a/patches.kabi/mwifiex-ieee-types-kabi-fix.patch b/patches.kabi/mwifiex-ieee-types-kabi-fix.patch
new file mode 100644
index 0000000000..4ac808900f
--- /dev/null
+++ b/patches.kabi/mwifiex-ieee-types-kabi-fix.patch
@@ -0,0 +1,56 @@
+From: Takashi Iwai <tiwai@suse.de>
+Subject: Fix kABI breakage by mwifiex security fix
+Patch-mainline: Never, kABI fix
+References: CVE-2019-3846,bsc#1136424
+
+The recent fix for mwifiex driver for a security issue
+ patches.fixes/mwifiex-Don-t-abort-on-small-spec-compliant-vendor-I.patch
+broke kABI. Fix by restoring the old firmware struct with ifdef.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/net/wireless/marvell/mwifiex/fw.h | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/drivers/net/wireless/marvell/mwifiex/fw.h
++++ b/drivers/net/wireless/marvell/mwifiex/fw.h
+@@ -1743,10 +1743,16 @@ struct mwifiex_ie_types_wmm_queue_status
+ struct ieee_types_vendor_header {
+ u8 element_id;
+ u8 len;
++#ifdef __GENKSYMS__
++ u8 oui[4]; /* 0~2: oui, 3: oui_type */
++ u8 oui_subtype;
++ u8 version;
++#else
+ struct {
+ u8 oui[3];
+ u8 oui_type;
+ } __packed oui;
++#endif
+ } __packed;
+
+ struct ieee_types_wmm_parameter {
+@@ -1760,8 +1766,10 @@ struct ieee_types_wmm_parameter {
+ * Version [1]
+ */
+ struct ieee_types_vendor_header vend_hdr;
++#ifndef __GENKSYMS__
+ u8 oui_subtype;
+ u8 version;
++#endif
+
+ u8 qos_info_bitmap;
+ u8 reserved;
+@@ -1780,8 +1788,10 @@ struct ieee_types_wmm_info {
+ * Version [1]
+ */
+ struct ieee_types_vendor_header vend_hdr;
++#ifndef __GENKSYMS__
+ u8 oui_subtype;
+ u8 version;
++#endif
+
+ u8 qos_info_bitmap;
+ } __packed;
diff --git a/series.conf b/series.conf
index 60dcc86d4d..5a42d37529 100644
--- a/series.conf
+++ b/series.conf
@@ -23356,6 +23356,7 @@
patches.kabi/ath10k-wmi-kabi-fix.patch
patches.suse/ath10k-QCA9377-firmware-limit.patch
patches.kabi/bt_accept_enqueue-kabi-workaround.patch
+ patches.kabi/mwifiex-ieee-types-kabi-fix.patch
########################################################
# ISDN