summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-05-24 07:43:48 -0400
committerJosh Boyer <jwboyer@redhat.com>2012-05-24 07:46:43 -0400
commit440886d0908f9f900d0fcd4b77d0838e940df7d6 (patch)
tree707886fe00f65e796a82bbf1b43aea93066aeb3b /kernel.spec
parentecd02ebffc0fe098f407c03fc8192e2362d0d766 (diff)
downloadkernel-440886d0908f9f900d0fcd4b77d0838e940df7d6.tar.gz
kernel-440886d0908f9f900d0fcd4b77d0838e940df7d6.tar.xz
kernel-440886d0908f9f900d0fcd4b77d0838e940df7d6.zip
CVE-2012-2372 mm: 32bit PAE pmd walk vs populate SMP race (rhbz 822821 822825)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec11
1 files changed, 10 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index 42854aab..0a91e020 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,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
@@ -753,6 +753,9 @@ Patch22000: weird-root-dentry-name-debug.patch
#selinux ptrace child permissions
Patch22001: selinux-apply-different-permission-to-ptrace-child.patch
+#rhbz 822825 822821 CVE-2012-2372
+Patch22021: mm-pmd_read_atomic-fix-32bit-PAE-pmd-walk-vs-pmd_populate-SMP-race-condition.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1451,6 +1454,9 @@ ApplyPatch highbank-export-clock-functions.patch
#vgaarb patches. blame mjg59
ApplyPatch vgaarb-vga_default_device.patch
+#rhbz 822825 822821 CVE-2012-2372
+ApplyPatch mm-pmd_read_atomic-fix-32bit-PAE-pmd-walk-vs-pmd_populate-SMP-race-condition.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2301,6 +2307,9 @@ fi
# ||----w |
# || ||
%changelog
+* Thu May 24 2012 Josh Boyer <jwboyer@redhat.com>
+- CVE-2012-2372 mm: 32bit PAE pmd walk vs populate SMP race (rhbz 822821 822825)
+
* Thu May 24 2012 Peter Robinson <pbrobinson@fedoraproject.org>
- Don't build Nokia ARM device support