summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2018-08-22 07:57:07 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2018-08-22 07:57:07 +0200
commit1c4016de516fb6192ae6698aa50fc654ae5b9e29 (patch)
treeb0c051180694f006d461e1ef868ee07f21dc2371 /kernel.spec
parent3848642811a60e4eb39b5371628edc5027b3e1c0 (diff)
parentec7eeb8d9547edda935da1265094d07e86168ed8 (diff)
downloadkernel-1c4016de516fb6192ae6698aa50fc654ae5b9e29.tar.gz
kernel-1c4016de516fb6192ae6698aa50fc654ae5b9e29.tar.xz
kernel-1c4016de516fb6192ae6698aa50fc654ae5b9e29.zip
Merge remote-tracking branch 'origin/f29' into f29-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 7daf6af0d..f4c5441f5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -664,6 +664,9 @@ Patch528: 0008-console-dummycon-export-dummycon_-un-register_output.patch
Patch529: 0009-fbcon-Only-defer-console-takeover-if-the-current-con.patch
Patch530: 0010-fbcon-Do-not-takeover-the-console-from-atomic-contex.patch
+# CVE-2018-15471 rhbz 1610555 1618414
+Patch531: xsa270.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1926,6 +1929,12 @@ fi
#
#
%changelog
+* Mon Aug 20 2018 Laura Abbott <labbott@redhat.com> - 4.18.3-300
+- Linux v4.18.3
+
+* Mon Aug 20 2018 Justin M. Forbes <jforbes@fedoraproject.org>
+- Fix CVE-2018-15471 (rhbz 1610555 1618414)
+
* Fri Aug 17 2018 Peter Robinson <pbrobinson@fedoraproject.org>
- Add fix and re-enable BPF JIT on ARMv7