summaryrefslogtreecommitdiff
path: root/2.6.32
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2013-05-31 04:36:00 -0400
committerAnthony G. Basile <blueness@gentoo.org>2013-05-31 04:36:00 -0400
commitae1a30b46e35c812cbafd2e6e93e8e439fb81481 (patch)
tree8387bb337d14b7b4fcb52e87cc9725e7b11566fc /2.6.32
parentGrsec/PaX: 2.9.1-{2.6.32.60,3.2.45,3.9.4}-201305292151 (diff)
downloadhardened-patchset-ae1a30b46e35c812cbafd2e6e93e8e439fb81481.tar.gz
hardened-patchset-ae1a30b46e35c812cbafd2e6e93e8e439fb81481.tar.bz2
hardened-patchset-ae1a30b46e35c812cbafd2e6e93e8e439fb81481.zip
Grsec/PaX: 2.9.1-{2.6.32.60,3.2.45,3.9.4}-20130530192720130530
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.60-201305301924.patch (renamed from 2.6.32/4420_grsecurity-2.9.1-2.6.32.60-201305292148.patch)4
2 files changed, 3 insertions, 3 deletions
diff --git a/2.6.32/0000_README b/2.6.32/0000_README
index 378709b..1fce241 100644
--- a/2.6.32/0000_README
+++ b/2.6.32/0000_README
@@ -34,7 +34,7 @@ Patch: 1059_linux-2.6.32.60.patch
From: http://www.kernel.org
Desc: Linux 2.6.32.59
-Patch: 4420_grsecurity-2.9.1-2.6.32.60-201305292148.patch
+Patch: 4420_grsecurity-2.9.1-2.6.32.60-201305301924.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.60-201305292148.patch b/2.6.32/4420_grsecurity-2.9.1-2.6.32.60-201305301924.patch
index a6ebcd3..220fd66 100644
--- a/2.6.32/4420_grsecurity-2.9.1-2.6.32.60-201305292148.patch
+++ b/2.6.32/4420_grsecurity-2.9.1-2.6.32.60-201305301924.patch
@@ -107973,7 +107973,7 @@ index 04a0252..4ee2bbb 100644
struct tasklet_struct *list;
diff --git a/kernel/sys.c b/kernel/sys.c
-index e9512b1..b6c0a2e 100644
+index e9512b1..892ee9e 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -133,6 +133,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
@@ -108144,7 +108144,7 @@ index e9512b1..b6c0a2e 100644
+ user in between this limit change and an execve by this task, force
+ a recheck only for this task by setting PF_NPROC_EXCEEDED
+ */
-+ if (resource == RLIMIT_NPROC)
++ if (resource == RLIMIT_NPROC && current->real_cred->user != INIT_USER)
+ current->flags |= PF_NPROC_EXCEEDED;
+
/*