summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Ludd <solar@gentoo.org>2005-01-18 17:37:35 +0000
committerNed Ludd <solar@gentoo.org>2005-01-18 17:37:35 +0000
commit4e0248261a8754160e44ede9c52e6f83a812845f (patch)
tree15f425ffd8cdf2538845a29341f20ee6c85943cb /sys-kernel/grsec-sources/files
parentremoved junit test to fix bug #71952. (diff)
downloadgentoo-2-4e0248261a8754160e44ede9c52e6f83a812845f.tar.gz
gentoo-2-4e0248261a8754160e44ede9c52e6f83a812845f.tar.bz2
gentoo-2-4e0248261a8754160e44ede9c52e6f83a812845f.zip
- version bump for security bug #77666 and removed some older unneeded ebuilds.
(Portage version: 2.0.51-r13)
Diffstat (limited to 'sys-kernel/grsec-sources/files')
-rw-r--r--sys-kernel/grsec-sources/files/2.4.29-CAN-2005-0001.patch44
-rw-r--r--sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.28.2.0.2-r12
-rw-r--r--sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.28.2.0.2-r22
-rw-r--r--sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.28.2.1.0-r13
4 files changed, 47 insertions, 4 deletions
diff --git a/sys-kernel/grsec-sources/files/2.4.29-CAN-2005-0001.patch b/sys-kernel/grsec-sources/files/2.4.29-CAN-2005-0001.patch
new file mode 100644
index 000000000000..6b687788f912
--- /dev/null
+++ b/sys-kernel/grsec-sources/files/2.4.29-CAN-2005-0001.patch
@@ -0,0 +1,44 @@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/12 09:14:50-02:00 marcelo.tosatti@cyclades.com
+# [PATCH] Fix expand_stack() SMP race
+#
+# Description: Fix expand_stack() SMP race
+#
+# Two threads sharing the same VMA can race in expand_stack, resulting in incorrect VMA
+# size accounting and possibly a "uncovered-by-VMA" pte leak.
+#
+# Fix is to check if the stack has already been expanded after acquiring a lock which
+# guarantees exclusivity (page_table_lock in v2.4 and vma_anon lock in v2.6).
+#
+# include/linux/mm.h
+# 2005/01/07 14:51:21-02:00 marcelo.tosatti@cyclades.com +10 -3
+# Fix expand_stack() SMP race
+#
+diff -Nru a/include/linux/mm.h b/include/linux/mm.h
+--- a/include/linux/mm.h 2005-01-13 04:59:30 -08:00
++++ b/include/linux/mm.h 2005-01-13 04:59:30 -08:00
+@@ -648,12 +648,19 @@
+ unsigned long grow;
+
+ /*
+- * vma->vm_start/vm_end cannot change under us because the caller is required
+- * to hold the mmap_sem in write mode. We need to get the spinlock only
+- * before relocating the vma range ourself.
++ * vma->vm_start/vm_end cannot change under us because the caller
++ * is required to hold the mmap_sem in read mode. We need the
++ * page_table_lock lock to serialize against concurrent expand_stacks.
+ */
+ address &= PAGE_MASK;
+ spin_lock(&vma->vm_mm->page_table_lock);
++
++ /* already expanded while we were spinning? */
++ if (vma->vm_start <= address) {
++ spin_unlock(&vma->vm_mm->page_table_lock);
++ return 0;
++ }
++
+ grow = (vma->vm_start - address) >> PAGE_SHIFT;
+ if (vma->vm_end - address > current->rlim[RLIMIT_STACK].rlim_cur ||
+ ((vma->vm_mm->total_vm + grow) << PAGE_SHIFT) > current->rlim[RLIMIT_AS].rlim_cur) {
diff --git a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.28.2.0.2-r1 b/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.28.2.0.2-r1
deleted file mode 100644
index 04b30398565d..000000000000
--- a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.28.2.0.2-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2f2e5e29772fdacd04129ba16a24afcf grsecurity-2.0.2-2.4.28.patch.gz 141933
-MD5 ac7735000d185bc7778c08288760a8a3 linux-2.4.28.tar.bz2 31064046
diff --git a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.28.2.0.2-r2 b/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.28.2.0.2-r2
deleted file mode 100644
index 04b30398565d..000000000000
--- a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.28.2.0.2-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2f2e5e29772fdacd04129ba16a24afcf grsecurity-2.0.2-2.4.28.patch.gz 141933
-MD5 ac7735000d185bc7778c08288760a8a3 linux-2.4.28.tar.bz2 31064046
diff --git a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.28.2.1.0-r1 b/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.28.2.1.0-r1
new file mode 100644
index 000000000000..c85fde9d5a55
--- /dev/null
+++ b/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.28.2.1.0-r1
@@ -0,0 +1,3 @@
+MD5 afbd071ae702af4668b2aea32868a698 grsecurity-2.1.0-2.4.28-200501051112.patch 691305
+MD5 ac7735000d185bc7778c08288760a8a3 linux-2.4.28.tar.bz2 31064046
+MD5 3fa09a0d8ea8def546b840bde027d61b linux-2.4.28-CAN-2004-0814.patch 145009