summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2019-11-25 18:31:53 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2019-11-25 18:31:53 +0100
commit288ae1c5232eaee23d77f5214098237151452b00 (patch)
tree70982c326b7709444b704feba1715ea5847ca6a6 /kernel.spec
parentdd0580bec53fbea1f387990d46f7a8b0e3264ec0 (diff)
parentbe6041e7ff7b38fbfb8058dd00e02e34b382ca68 (diff)
downloadkernel-288ae1c5232eaee23d77f5214098237151452b00.tar.gz
kernel-288ae1c5232eaee23d77f5214098237151452b00.tar.xz
kernel-288ae1c5232eaee23d77f5214098237151452b00.zip
merge origin
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec32
1 files changed, 21 insertions, 11 deletions
diff --git a/kernel.spec b/kernel.spec
index 91a3423fb..d3179fa0f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -609,22 +609,12 @@ Source11: x509.genkey.fedora
Source12: securebootca.cer
Source13: secureboot.cer
-#Source14: secureboot_s390.cer
-#Source15: secureboot_ppc.cer
%define secureboot_ca %{SOURCE12}
%ifarch x86_64 aarch64
%define secureboot_key %{SOURCE13}
%define pesign_name redhatsecureboot301
%endif
-%ifarch s390x
-%define secureboot_key %{SOURCE14}
-%define pesign_name redhatsecureboot302
-%endif
-%ifarch ppc64le
-%define secureboot_key %{SOURCE15}
-%define pesign_name redhatsecureboot303
-%endif
%else # released_kernel
@@ -637,7 +627,7 @@ Source13: redhatsecureboot003.cer
%endif # released_kernel
-Source22: mod-extra.list.rhel
+Source15: mod-extra.list.rhel
Source16: mod-extra.list.fedora
Source17: mod-extra.sh
Source18: mod-sign.sh
@@ -867,6 +857,19 @@ Patch522: mwifiex-pcie-fix-memory-leak-in-mwifiex_pcie_alloc_cmdrsp_buf.patch
# CVE-2019-19054 rhbz 1775063 1775117
Patch524: media-rc-prevent-memory-leak-in-cx23888_ir_probe.patch
+# CVE-2019-14895 rhbz 1774870 1776139
+Patch525: mwifiex-fix-possible-heap-overflow-in-mwifiex_process_country_ie.patch
+
+# CVE-2019-14896 rhbz 1774875 1776143
+# CVE-2019-14897 rhbz 1774879 1776146
+Patch526: libertas-Fix-two-buffer-overflows-at-parsing-bss-descriptor.patch
+
+# CVE-2019-14901 rhbz 1773519 1776184
+Patch527: mwifiex-Fix-heap-overflow-in-mmwifiex_process_tdls_action_frame.patch
+
+# CVE-2019-19078 rhbz 1776354 1776353
+Patch528: ath10k-fix-memory-leak.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -2568,6 +2571,13 @@ fi
#
#
%changelog
+* Mon Nov 25 2019 Justin M. Forbes <jforbes@fedoraproject.org>
+- Fix CVE-2019-14895 (rhbz 1774870 1776139)
+- Fix CVE-2019-14896 (rhbz 1774875 1776143)
+- Fix CVE-2019-14897 (rhbz 1774879 1776146)
+- Fix CVE-2019-14901 (rhbz 1773519 1776184)
+- Fix CVE-2019-19078 (rhbz 1776354 1776353)
+
* Mon Nov 25 2019 Jeremy Cline <jcline@redhat.com> - 5.4.0-1
- Linux v5.4.0