summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-06-06 10:05:59 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-06-06 10:12:53 -0400
commitdbcd356345c1fcbc2aed02f4e9020c52f20f9b58 (patch)
treedc05406e7f5bb044ff9356da41d2a8b601b4d169 /kernel.spec
parenta279c6e9c30f3e7208aaeddc307682a70aae74b0 (diff)
downloadkernel-dbcd356345c1fcbc2aed02f4e9020c52f20f9b58.tar.gz
kernel-dbcd356345c1fcbc2aed02f4e9020c52f20f9b58.tar.xz
kernel-dbcd356345c1fcbc2aed02f4e9020c52f20f9b58.zip
CVE-2014-3940 missing check during hugepage migration (rhbz 1104097 1105042)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec8
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 47a55798..7cd35250 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -642,6 +642,9 @@ Patch25071: s390-appldata-add-slab.h-for-kzalloc-kfree.patch
# CVE-2014-3917 rhbz 1102571 1102715
Patch25093: auditsc-audit_krule-mask-accesses-need-bounds-checking.patch
+# CVE-2014-3940 rhbz 1104097 1105042
+Patch25094: mm-add-pte_present-check-on-existing-hugetlb_entry-callbacks.patch
+
Patch26000: perf-lib64.patch
# Patch series from Hans for various backlight and platform driver fixes
@@ -1395,6 +1398,10 @@ ApplyPatch acpi-video-Unregister-the-backlight-device-if-a-raw-.patch
ApplyPatch acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch
ApplyPatch acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch
+
+# CVE-2014-3940 rhbz 1104097 1105042
+ApplyPatch mm-add-pte_present-check-on-existing-hugetlb_entry-callbacks.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2268,6 +2275,7 @@ fi
# || ||
%changelog
* Fri Jun 06 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc8.git4.1
+- CVE-2014-3940 missing check during hugepage migration (rhbz 1104097 1105042)
- Linux v3.15-rc8-81-g951e273060d1
* Thu Jun 05 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc8.git3.1