Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
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
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
-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
-rw-r--r--3.2.45/0000_README2
-rw-r--r--3.2.45/4420_grsecurity-2.9.1-3.2.45-201305301925.patch (renamed from 3.2.45/4420_grsecurity-2.9.1-3.2.45-201305292150.patch)4
-rw-r--r--3.9.4/0000_README2
-rw-r--r--3.9.4/4420_grsecurity-2.9.1-3.9.4-201305301927.patch (renamed from 3.9.4/4420_grsecurity-2.9.1-3.9.4-201305292151.patch)4
6 files changed, 9 insertions, 9 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;
+
/*
diff --git a/3.2.45/0000_README b/3.2.45/0000_README
index 577c9db..c1bb1b0 100644
--- a/3.2.45/0000_README
+++ b/3.2.45/0000_README
@@ -98,7 +98,7 @@ Patch: 1044_linux-3.2.45.patch
From: http://www.kernel.org
Desc: Linux 3.2.45
-Patch: 4420_grsecurity-2.9.1-3.2.45-201305292150.patch
+Patch: 4420_grsecurity-2.9.1-3.2.45-201305301925.patch
From: http://www.grsecurity.net
Desc: hardened-sources base patch from upstream grsecurity
diff --git a/3.2.45/4420_grsecurity-2.9.1-3.2.45-201305292150.patch b/3.2.45/4420_grsecurity-2.9.1-3.2.45-201305301925.patch
index 52e473e..4aeabd6 100644
--- a/3.2.45/4420_grsecurity-2.9.1-3.2.45-201305292150.patch
+++ b/3.2.45/4420_grsecurity-2.9.1-3.2.45-201305301925.patch
@@ -78525,7 +78525,7 @@ index 2f194e9..2c05ea9 100644
.priority = 10,
};
diff --git a/kernel/sys.c b/kernel/sys.c
-index be5fa8b..bb69d33 100644
+index be5fa8b..a8c2090 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -158,6 +158,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
@@ -78682,7 +78682,7 @@ index be5fa8b..bb69d33 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 && tsk->real_cred->user != INIT_USER)
+ tsk->flags |= PF_NPROC_EXCEEDED;
}
if (!retval) {
diff --git a/3.9.4/0000_README b/3.9.4/0000_README
index 66c5468..236a360 100644
--- a/3.9.4/0000_README
+++ b/3.9.4/0000_README
@@ -2,7 +2,7 @@ README
-----------------------------------------------------------------------------
Individual Patch Descriptions:
-----------------------------------------------------------------------------
-Patch: 4420_grsecurity-2.9.1-3.9.4-201305292151.patch
+Patch: 4420_grsecurity-2.9.1-3.9.4-201305301927.patch
From: http://www.grsecurity.net
Desc: hardened-sources base patch from upstream grsecurity
diff --git a/3.9.4/4420_grsecurity-2.9.1-3.9.4-201305292151.patch b/3.9.4/4420_grsecurity-2.9.1-3.9.4-201305301927.patch
index 8cdedca..06e925c 100644
--- a/3.9.4/4420_grsecurity-2.9.1-3.9.4-201305292151.patch
+++ b/3.9.4/4420_grsecurity-2.9.1-3.9.4-201305301927.patch
@@ -78370,7 +78370,7 @@ index 01d5ccb..cdcbee6 100644
return idx;
}
diff --git a/kernel/sys.c b/kernel/sys.c
-index 0da73cf..a22106a 100644
+index 0da73cf..5c2af3c 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -158,6 +158,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
@@ -78527,7 +78527,7 @@ index 0da73cf..a22106a 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 && tsk->real_cred->user != INIT_USER)
+ tsk->flags |= PF_NPROC_EXCEEDED;
}
if (!retval) {