summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2017-07-21 20:00:09 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2017-07-21 20:00:09 +0200
commitac94a4c4bf442567c9a2330d56732b6185319b4c (patch)
tree89b5ac140514bcd1324c3dc44efee4887d0a9361 /kernel.spec
parentb2d0497534f2778ca8da58a15e83f2c6f1044bab (diff)
parent75638e4e226b3c42b33ce1d950ab721812e6f316 (diff)
downloadkernel-4.11.12-200.vanilla.knurd.1.fc25.tar.gz
kernel-4.11.12-200.vanilla.knurd.1.fc25.tar.xz
kernel-4.11.12-200.vanilla.knurd.1.fc25.zip
Merge remote-tracking branch 'origin/f25' into f25-user-thl-vanilla-fedorakernel-4.11.12-200.vanilla.knurd.1.fc25
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec15
1 files changed, 14 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index c611893e6..3557ba83b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -58,7 +58,7 @@ Summary: The Linux kernel
%define stable_rc 0
# Do we have a -stable update to apply?
-%define stable_update 11
+%define stable_update 12
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev %{stable_update}
@@ -651,6 +651,12 @@ Patch683: RFC-audit-fix-a-race-condition-with-the-auditd-tracking-code.patch
# rhbz 1458599
Patch685: 0001-ACPI-LPSS-Only-call-pwm_add_table-for-the-first-PWM-.patch
+# CVE-2017-7542 rhbz 1473649 1473650
+Patch701: 0001-ipv6-avoid-overflow-of-offset-in-ip6_find_1stfragopt.patch
+
+# CVE-2017-11473 rhbz 1473209 147310
+Patch702: CVE-2017-11473.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -2218,6 +2224,13 @@ fi
#
#
%changelog
+* Fri Jul 21 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.12-200
+- Linux v4.11.12
+
+* Fri Jul 21 2017 Justin M. Forbes <jforbes@fedoraproject.org>
+- Fix CVE-2017-7542 (rhbz 1473649 1473650)
+- Fix CVE-2017-11473 (rhbz 1473209 147310)
+
* Mon Jul 17 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.11-200
- Linux v4.11.11
- Bring back /dev/port (rhbz 1471429 1451220)