summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-05-14 08:24:39 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-05-14 08:24:39 +0200
commitbe5167e3c3afba95a2e94abda299cf89d2213b8e (patch)
tree7495fb07d5e831d07181134bee9422604ffb417f /kernel.spec
parentfeca0d8c9d4905dc6d84f1c63fccb6976f63b51f (diff)
parent364418124060eb317c531a5b6c94bdedbc455968 (diff)
downloadkernel-be5167e3c3afba95a2e94abda299cf89d2213b8e.tar.gz
kernel-be5167e3c3afba95a2e94abda299cf89d2213b8e.tar.xz
kernel-be5167e3c3afba95a2e94abda299cf89d2213b8e.zip
Merge remote-tracking branch 'origin/f30' into f30-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec9
1 files changed, 9 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index e0ce9f97c..281371c2b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -630,6 +630,9 @@ Patch511: e1000e-bump-up-timeout-to-wait-when-ME-un-configure-ULP-mode.patch
Patch512: drm-dp_mst-Fix-drm_dp_send_dpcd_write-return-code.patch
+# CVE-2020-10711 rhbz 1825116 1834778
+Patch513: net-netlabel-cope-with-NULL-catmap.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1863,6 +1866,12 @@ fi
#
#
%changelog
+* Tue May 12 2020 Justin M. Forbes <jforbes@fedoraproject.org>
+- Fix CVE-2020-10711 (rhbz 1825116 1834778)
+
+* Mon May 11 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.6.12-100
+- Linux v5.6.12
+
* Wed May 06 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.6.11-100
- Linux v5.6.11