summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-01-13 11:18:16 -0500
committerJosh Boyer <jwboyer@redhat.com>2012-01-13 11:18:16 -0500
commit3aa57a610543086ee7c7bf9f0c455b49d6b2f0b0 (patch)
tree6cb8bf5379768e0eb193c1cd4ea64005de152689 /kernel.spec
parentfdb68da43b60ef7d2a19bbe2b56728d9db25566d (diff)
downloadkernel-3aa57a610543086ee7c7bf9f0c455b49d6b2f0b0.tar.gz
kernel-3aa57a610543086ee7c7bf9f0c455b49d6b2f0b0.tar.xz
kernel-3aa57a610543086ee7c7bf9f0c455b49d6b2f0b0.zip
CVE-2012-0045 kvm: syscall instruction induced guest panic (rhbz 773392)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec13
1 files changed, 12 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index cf203e387..4dc251b6e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -757,6 +757,10 @@ Patch21071: ext4-Fix-error-handling-on-inode-bitmap-corruption.patch
#rhbz 769766
Patch21072: mac80211-fix-rx-key-NULL-ptr-deref-in-promiscuous-mode.patch
+#rhbz 773392
+Patch21073: KVM-x86-extend-struct-x86_emulate_ops-with-get_cpuid.patch
+Patch21074: KVM-x86-fix-missing-checks-in-syscall-emulation.patch
+
# compat-wireless patches
Patch50000: compat-wireless-config-fixups.patch
Patch50001: compat-wireless-pr_fmt-warning-avoidance.patch
@@ -1467,6 +1471,10 @@ ApplyPatch ext4-Fix-error-handling-on-inode-bitmap-corruption.patch
ApplyPatch mac80211-fix-rx-key-NULL-ptr-deref-in-promiscuous-mode.patch
+#rhbz 773392
+ApplyPatch KVM-x86-extend-struct-x86_emulate_ops-with-get_cpuid.patch
+ApplyPatch KVM-x86-fix-missing-checks-in-syscall-emulation.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2301,6 +2309,9 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Jan 13 2012 Josh Boyer <jwboyer@redhat.com> 3.2.1-2
+- CVE-2012-0045 kvm: syscall instruction induced guest panic (rhbz 773392)
+
* Fri Jan 13 2012 Josh Boyer <jwboyer@redhat.com> 3.2.1-1
- Linux 3.1.2
- Change stable patch compression format to xz