summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-05-14 08:24:21 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-05-14 08:24:21 +0200
commit48bb2f73eb2bf1bc6d894a23c0038f82427d0000 (patch)
tree56fa1ac19227e411093d7770f34094d7dbadd9ec /kernel.spec
parentd62dfd722186e6a8390ad84653ca416867b46e74 (diff)
parent5cd9a1b23bbbec24f24fc08fb3d84de6846db72b (diff)
downloadkernel-48bb2f73eb2bf1bc6d894a23c0038f82427d0000.tar.gz
kernel-48bb2f73eb2bf1bc6d894a23c0038f82427d0000.tar.xz
kernel-48bb2f73eb2bf1bc6d894a23c0038f82427d0000.zip
Merge remote-tracking branch 'origin/f32' into f32-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec12
1 files changed, 12 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 56404656c..10b883a68 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -838,6 +838,9 @@ Patch303: ACPI-irq-Workaround-firmware-issue-on-X-Gene-based-m400.patch
Patch304: ARM-tegra-usb-no-reset.patch
+# https://patchwork.kernel.org/patch/11527525/
+Patch305: usb-usbfs-correct-kernel-user-page-attribute-mismatch.patch
+
# Raspberry Pi
# https://patchwork.kernel.org/cover/11353083/
Patch310: arm64-pinctrl-bcm2835-Add-support-for-all-BCM2711-GPIOs.patch
@@ -922,6 +925,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
@@ -3021,6 +3027,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-300
+- Linux v5.6.12
+
* Wed May 06 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.6.11-300
- Linux v5.6.11