summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2019-07-21 19:23:12 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2019-07-21 19:23:12 +0200
commitd78acd272050c215695799bf9242e91c382e5281 (patch)
tree60a894f48b076e6e1a777ad47e187d6c2fde20b4 /kernel.spec
parent4e4971edcd1f4c914591f46de9a3cf1c682d4361 (diff)
parent3d5a0b43e81f1ec5e6e2be3d777406d170935e79 (diff)
downloadkernel-d78acd272050c215695799bf9242e91c382e5281.tar.gz
kernel-d78acd272050c215695799bf9242e91c382e5281.tar.xz
kernel-d78acd272050c215695799bf9242e91c382e5281.zip
Merge remote-tracking branch 'origin/f30' into f30-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec6
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index ed53e9f39..5d48ee954 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -648,6 +648,9 @@ Patch546: netfilter-ctnetlink-Fix-regression-in-conntrack-entry.patch
# https://patchwork.kernel.org/patch/11029027/
Patch547: iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch
+# CVE-2019-13631 rhbz 1731000 1731001
+Patch548: Input-gtco-bounds-check-collection-indent-level.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1889,6 +1892,9 @@ fi
#
#
%changelog
+* Thu Jul 18 2019 Jeremy Cline <jcline@redhat.com>
+- Fix CVE-2019-13631 (rhbz 1731000 1731001)
+
* Mon Jul 15 2019 Jeremy Cline <jcline@redhat.com> - 5.1.18-300
- Linux v5.1.18