summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2012-04-19 16:03:21 -0500
committerJustin M. Forbes <jforbes@redhat.com>2012-04-19 16:03:21 -0500
commit1174973de19bbac7f7d9a035f7dd7aeb07f75af4 (patch)
tree94ea39c75bfeb59db83de0d8dcbbdbad95429d7d /kernel.spec
parent7d3a78564ab43271375c063fe37bd9bdd0296d37 (diff)
downloadkernel-1174973de19bbac7f7d9a035f7dd7aeb07f75af4.tar.gz
kernel-1174973de19bbac7f7d9a035f7dd7aeb07f75af4.tar.xz
kernel-1174973de19bbac7f7d9a035f7dd7aeb07f75af4.zip
Linux v3.4-rc3-65-g9b7f43a
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec27
1 files changed, 17 insertions, 10 deletions
diff --git a/kernel.spec b/kernel.spec
index 9d50c7cf2..3fb13c567 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -95,7 +95,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 3
# The git snapshot level
-%define gitrev 2
+%define gitrev 3
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -737,9 +737,6 @@ Patch21260: x86-Avoid-invoking-RCU-when-CPU-is-idle.patch
#rhbz 804957 CVE-2012-1568
Patch21306: shlib_base_randomize.patch
-#rhbz 807632
-Patch21385: libata-forbid-port-runtime-pm-by-default.patch
-
Patch21400: unhandled-irqs-switch-to-polling.patch
Patch21620: vgaarb-vga_default_device.patch
@@ -752,9 +749,12 @@ Patch22000: weird-root-dentry-name-debug.patch
#selinux ptrace child permissions
Patch22001: selinux-apply-different-permission-to-ptrace-child.patch
-#rhbz 814149 814155
+#rhbz 814149 814155 CVE-2012-2121
Patch22006: KVM-unmap-pages-from-the-iommu-when-slots-are-removed.patch
+#rhbz 814278 814289 CVE-2012-2119
+Patch22007: macvtap-zerocopy-validate-vector-length.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1446,9 +1446,6 @@ ApplyPatch selinux-apply-different-permission-to-ptrace-child.patch
#Highbank clock functions
ApplyPatch highbank-export-clock-functions.patch
-#rhbz 807632
-ApplyPatch libata-forbid-port-runtime-pm-by-default.patch
-
#vgaarb patches. blame mjg59
ApplyPatch vgaarb-vga_default_device.patch
@@ -1456,9 +1453,12 @@ ApplyPatch vgaarb-vga_default_device.patch
ApplyPatch x86-microcode-Fix-sysfs-warning-during-module-unload-on-unsupported-CPUs.patch
ApplyPatch x86-microcode-Ensure-that-module-is-only-loaded-for-supported-AMD-CPUs.patch
-#rhbz 814149 814155
+#rhbz 814149 814155 CVE-2012-2121
ApplyPatch KVM-unmap-pages-from-the-iommu-when-slots-are-removed.patch
+#rhbz 814278 814289 CVE-2012-2119
+ApplyPatch macvtap-zerocopy-validate-vector-length.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2319,8 +2319,15 @@ fi
# ||----w |
# || ||
%changelog
+* Thu Apr 19 2012 Justin M. Forbes <jforbes@redhat.com> - 3.4.0-0.rc3.git3.1
+- Linux v3.4-rc3-65-g9b7f43a
+
+* Thu Apr 19 2012 Justin M. Forbes <jforbes@redhat.com>
+- CVE-2012-2119 macvtap: zerocopy: vector length is not validated before
+ pinning user pages (rhbz 814278 814289)
+
* Thu Apr 19 2012 Justin M. Forbes <jforbes@redhat.com>
-- Fix KVM device assignment page leak (rhbz 814149 814155)
+- CVE-2012-2121: Fix KVM device assignment page leak (rhbz 814149 814155)
* Wed Apr 18 2012 Justin M. Forbes <jforbes@redhat.com> - 3.4.0-0.rc3.git2.1
- Linux v3.4-rc3-36-g592fe89