summaryrefslogtreecommitdiff
path: root/2.6.32
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2013-07-15 08:02:23 -0400
committerAnthony G. Basile <blueness@gentoo.org>2013-07-15 08:02:23 -0400
commit27d1014ac305f822f0f1acb3056490a8c44ee80a (patch)
tree337d2e2ce0bdd44a184d82712cc02e5374ba14ab /2.6.32
parentGrsec/PaX: 2.9.1-{2.6.32.61,3.2.48.3.10.0}-201307092224 (diff)
downloadhardened-patchset-27d1014ac305f822f0f1acb3056490a8c44ee80a.tar.gz
hardened-patchset-27d1014ac305f822f0f1acb3056490a8c44ee80a.tar.bz2
hardened-patchset-27d1014ac305f822f0f1acb3056490a8c44ee80a.zip
Grsec/PaX: 2.9.1-{2.6.32.61,3.2.48.3.10.1}-20130714192320130714
Diffstat (limited to '2.6.32')
-rw-r--r--2.6.32/0000_README2
-rw-r--r--2.6.32/4420_grsecurity-2.9.1-2.6.32.61-201307122305.patch (renamed from 2.6.32/4420_grsecurity-2.9.1-2.6.32.61-201307092216.patch)21
2 files changed, 22 insertions, 1 deletions
diff --git a/2.6.32/0000_README b/2.6.32/0000_README
index 0d60549..246c88b 100644
--- a/2.6.32/0000_README
+++ b/2.6.32/0000_README
@@ -38,7 +38,7 @@ Patch: 1060_linux-2.6.32.61.patch
From: http://www.kernel.org
Desc: Linux 2.6.32.61
-Patch: 4420_grsecurity-2.9.1-2.6.32.61-201307092216.patch
+Patch: 4420_grsecurity-2.9.1-2.6.32.61-201307122305.patch
From: http://www.grsecurity.net
Desc: hardened-sources base patch from upstream grsecurity
diff --git a/2.6.32/4420_grsecurity-2.9.1-2.6.32.61-201307092216.patch b/2.6.32/4420_grsecurity-2.9.1-2.6.32.61-201307122305.patch
index 55e1dcb..bac4e6d 100644
--- a/2.6.32/4420_grsecurity-2.9.1-2.6.32.61-201307092216.patch
+++ b/2.6.32/4420_grsecurity-2.9.1-2.6.32.61-201307122305.patch
@@ -6682,6 +6682,27 @@ index 2782681..77ded84 100644
extra-y := head_$(BITS).o
extra-y += init_task.o
+diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c
+index 6a831bd..b37a849 100644
+--- a/arch/sparc/kernel/ds.c
++++ b/arch/sparc/kernel/ds.c
+@@ -780,6 +780,16 @@ void ldom_set_var(const char *var, const char *value)
+ char *base, *p;
+ int msg_len, loops;
+
++ if (strlen(var) + strlen(value) + 2 >
++ sizeof(pkt) - sizeof(pkt.header)) {
++ printk(KERN_ERR PFX
++ "contents length: %zu, which more than max: %lu,"
++ "so could not set (%s) variable to (%s).\n",
++ strlen(var) + strlen(value) + 2,
++ sizeof(pkt) - sizeof(pkt.header), var, value);
++ return;
++ }
++
+ memset(&pkt, 0, sizeof(pkt));
+ pkt.header.data.tag.type = DS_DATA;
+ pkt.header.data.handle = cp->handle;
diff --git a/arch/sparc/kernel/iommu.c b/arch/sparc/kernel/iommu.c
index 7690cc2..ece64c9 100644
--- a/arch/sparc/kernel/iommu.c