summaryrefslogtreecommitdiff
path: root/2.6.32
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2012-10-09 08:31:03 -0400
committerAnthony G. Basile <blueness@gentoo.org>2012-10-09 08:31:03 -0400
commit4e05d5d8c2d5278d61dcfbc7f9a832817af4591f (patch)
tree6163140c4a78b02c9d5e0a1ed7940c75418be8d8 /2.6.32
parentGrsec/PaX: 2.9.1-{2.6.32.59,3.2.30,3.5.5}-201210070828 (diff)
downloadhardened-patchset-4e05d5d8c2d5278d61dcfbc7f9a832817af4591f.tar.gz
hardened-patchset-4e05d5d8c2d5278d61dcfbc7f9a832817af4591f.tar.bz2
hardened-patchset-4e05d5d8c2d5278d61dcfbc7f9a832817af4591f.zip
Grsec/PaX: 2.9.1-{2.6.32.59,3.2.30,3.5.6}-20121007171620121007
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.59-201210071703.patch (renamed from 2.6.32/4420_grsecurity-2.9.1-2.6.32.59-201210070827.patch)12
2 files changed, 11 insertions, 3 deletions
diff --git a/2.6.32/0000_README b/2.6.32/0000_README
index 42845f1..05a4857 100644
--- a/2.6.32/0000_README
+++ b/2.6.32/0000_README
@@ -30,7 +30,7 @@ Patch: 1058_linux-2.6.32.59.patch
From: http://www.kernel.org
Desc: Linux 2.6.32.59
-Patch: 4420_grsecurity-2.9.1-2.6.32.59-201210070827.patch
+Patch: 4420_grsecurity-2.9.1-2.6.32.59-201210071703.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.59-201210070827.patch b/2.6.32/4420_grsecurity-2.9.1-2.6.32.59-201210071703.patch
index d90002f..3166836 100644
--- a/2.6.32/4420_grsecurity-2.9.1-2.6.32.59-201210070827.patch
+++ b/2.6.32/4420_grsecurity-2.9.1-2.6.32.59-201210071703.patch
@@ -75693,10 +75693,18 @@ index 9fe7d7e..cdb62c9 100644
seq_putc(m, '\n');
diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
-index 04d1270..ca49aa3 100644
+index 04d1270..9dbd384 100644
--- a/fs/proc/proc_net.c
+++ b/fs/proc/proc_net.c
-@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(struct inode *dir)
+@@ -22,6 +22,7 @@
+ #include <linux/nsproxy.h>
+ #include <net/net_namespace.h>
+ #include <linux/seq_file.h>
++#include <linux/grsecurity.h>
+
+ #include "internal.h"
+
+@@ -104,6 +105,17 @@ static struct net *get_proc_task_net(struct inode *dir)
struct task_struct *task;
struct nsproxy *ns;
struct net *net = NULL;