summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-03-20 10:31:52 -0400
committerJosh Boyer <jwboyer@redhat.com>2012-03-20 10:35:32 -0400
commit364473e5c59b1d2a2a8c2dd053f9a0013d37110e (patch)
tree0715e6d3e869574fa3bd65d13231166e93f4a50c /kernel.spec
parentb7da64597e570ad8c8a5625e3486c73bf85a7e90 (diff)
downloadkernel-364473e5c59b1d2a2a8c2dd053f9a0013d37110e.tar.gz
kernel-364473e5c59b1d2a2a8c2dd053f9a0013d37110e.tar.xz
kernel-364473e5c59b1d2a2a8c2dd053f9a0013d37110e.zip
CVE-2012-1568: execshield: predictable ascii armour base address (rhbz 804957)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec9
1 files changed, 8 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index 21eb9ea24..5526525a8 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 4
+%global baserelease 5
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -770,6 +770,9 @@ Patch21304: mm-thp-fix-pmd_bad-triggering.patch
#rhbz 804007
Patch21305: mac80211-fix-possible-tid_rx-reorder_timer-use-after-free.patch
+#rhbz 804957 CVE-2012-1568
+Patch21306: shlib_base_randomize.patch
+
Patch21400: unhandled-irqs-switch-to-polling.patch
Patch22000: weird-root-dentry-name-debug.patch
@@ -1484,6 +1487,9 @@ ApplyPatch sony-laptop-Enable-keyboard-backlight-by-default.patch
#rhbz 804007
ApplyPatch mac80211-fix-possible-tid_rx-reorder_timer-use-after-free.patch
+#rhbz 804957 CVE-2012-1568
+ApplyPatch shlib_base_randomize.patch
+
ApplyPatch unhandled-irqs-switch-to-polling.patch
ApplyPatch weird-root-dentry-name-debug.patch
@@ -2342,6 +2348,7 @@ fi
# || ||
%changelog
* Tue Mar 20 2012 Josh Boyer <jwboyer@redhat.com>
+- CVE-2012-1568: execshield: predictable ascii armour base address (rhbz 804957)
- mac80211: fix possible tid_rx->reorder_timer use after free
from Stanislaw Gruska (rhbz 804007)