summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-03-11 10:19:12 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-03-11 10:19:15 -0400
commitac03c510f03e736fe6d8a43b90ae66ff37c3a617 (patch)
tree5370d436774f6a62caefb9771f4aa9bfc51b78a7 /kernel.spec
parent00acd3eec4ed22578b1930a8c500ff17ffe8fc0d (diff)
downloadkernel-ac03c510f03e736fe6d8a43b90ae66ff37c3a617.tar.gz
kernel-ac03c510f03e736fe6d8a43b90ae66ff37c3a617.tar.xz
kernel-ac03c510f03e736fe6d8a43b90ae66ff37c3a617.zip
CVE-2015-2150 xen: NMIs triggerable by guests (rhbz 1196266 1200397)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec7
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 6a3bfbfff..515a052d9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -651,6 +651,9 @@ Patch26162: Input-synaptics-remove-X1-Carbon-3rd-gen-from-the-to.patch
Patch26163: Input-synaptics-remove-X250-from-the-topbuttonpad-li.patch
Patch26164: Revert-Input-synaptics-use-dmax-in-input_mt_assign_s.patch
+#CVE-2015-2150 rhbz 1196266 1200397
+Patch26165: xen-pciback-limit-guest-control-of-command-register.patch
+
# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
Patch30000: kernel-arm64.patch
@@ -1406,6 +1409,9 @@ ApplyPatch Input-synaptics-remove-X1-Carbon-3rd-gen-from-the-to.patch
ApplyPatch Input-synaptics-remove-X250-from-the-topbuttonpad-li.patch
ApplyPatch Revert-Input-synaptics-use-dmax-in-input_mt_assign_s.patch
+#CVE-2015-2150 rhbz 1196266 1200397
+ApplyPatch xen-pciback-limit-guest-control-of-command-register.patch
+
%if 0%{?aarch64patches}
ApplyPatch kernel-arm64.patch
%ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
@@ -2265,6 +2271,7 @@ fi
%changelog
* Wed Mar 11 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc3.git1.1
- Linux v4.0-rc3-111-gaffb8172de39
+- CVE-2015-2150 xen: NMIs triggerable by guests (rhbz 1196266 1200397)
- Patch series to fix Lenovo *40 and Carbon X1 touchpads (rhbz 1200777 1200778)
- Revert commit that added bad rpath to cpupower (rhbz 1199312)
- Reenable debugging options.