summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-05-14 08:24:24 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-05-14 08:24:24 +0200
commit1ab488a54c82e62f1567bab1c0d046a95991a1fb (patch)
tree049514412ff410d604b62dfb5c8c7240fa775c16 /kernel.spec
parent53b72673c9d0a4e264e18de95c9ba0eb85fa939b (diff)
parent58b171ce58c24d2a52da306f85a17e245746a3da (diff)
downloadkernel-1ab488a54c82e62f1567bab1c0d046a95991a1fb.tar.gz
kernel-1ab488a54c82e62f1567bab1c0d046a95991a1fb.tar.xz
kernel-1ab488a54c82e62f1567bab1c0d046a95991a1fb.zip
Merge remote-tracking branch 'origin/f31' into f31-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 7d31564d2..03c6c27bc 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -919,6 +919,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
@@ -2952,6 +2955,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-200
+- Linux v5.6.12
+
* Wed May 06 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.6.11-200
- Linux v5.6.11