summaryrefslogtreecommitdiff
path: root/2.6.32
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2013-04-12 06:39:36 -0400
committerAnthony G. Basile <blueness@gentoo.org>2013-04-13 14:17:54 -0400
commitbc371fc3e6797f6a9293d8bab888f587ea79bc98 (patch)
tree9ef8482250471484cd65d4ddf41a8cb09c1cd43a /2.6.32
parentGrsec/PaX: 2.9.1-{2.6.32.60,3.2.43,3.8.6}-201304102034 (diff)
downloadhardened-patchset-bc371fc3e6797f6a9293d8bab888f587ea79bc98.tar.gz
hardened-patchset-bc371fc3e6797f6a9293d8bab888f587ea79bc98.tar.bz2
hardened-patchset-bc371fc3e6797f6a9293d8bab888f587ea79bc98.zip
Grsec/PaX: 2.9.1-{2.6.32.60,3.2.43,3.8.6}-201304111817
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-201304111811.patch (renamed from 2.6.32/4420_grsecurity-2.9.1-2.6.32.60-201304102018.patch)20
2 files changed, 15 insertions, 7 deletions
diff --git a/2.6.32/0000_README b/2.6.32/0000_README
index 3154c9f..e34859b 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-201304102018.patch
+Patch: 4420_grsecurity-2.9.1-2.6.32.60-201304111811.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-201304102018.patch b/2.6.32/4420_grsecurity-2.9.1-2.6.32.60-201304111811.patch
index a2bcf7d..1520bdd 100644
--- a/2.6.32/4420_grsecurity-2.9.1-2.6.32.60-201304102018.patch
+++ b/2.6.32/4420_grsecurity-2.9.1-2.6.32.60-201304111811.patch
@@ -108419,10 +108419,18 @@ index d9d6206..f19467e 100644
ret = -EIO;
bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
-index 4872937..26ba80f 100644
+index 4872937..9c613c4 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
-@@ -1100,13 +1100,18 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
+@@ -469,7 +469,6 @@ int ftrace_profile_pages_init(struct ftrace_profile_stat *stat)
+ free_page(tmp);
+ }
+
+- free_page((unsigned long)stat->pages);
+ stat->pages = NULL;
+ stat->start = NULL;
+
+@@ -1100,13 +1099,18 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
ip = rec->ip;
@@ -108443,7 +108451,7 @@ index 4872937..26ba80f 100644
}
/*
-@@ -2726,7 +2731,7 @@ static int ftrace_module_notify(struct notifier_block *self,
+@@ -2726,7 +2730,7 @@ static int ftrace_module_notify(struct notifier_block *self,
struct notifier_block ftrace_module_nb = {
.notifier_call = ftrace_module_notify,
@@ -108452,7 +108460,7 @@ index 4872937..26ba80f 100644
};
extern unsigned long __start_mcount_loc[];
-@@ -3068,8 +3073,6 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,
+@@ -3068,8 +3072,6 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
static int ftrace_graph_active;
@@ -108461,7 +108469,7 @@ index 4872937..26ba80f 100644
int ftrace_graph_entry_stub(struct ftrace_graph_ent *trace)
{
return 0;
-@@ -3213,6 +3216,10 @@ ftrace_suspend_notifier_call(struct notifier_block *bl, unsigned long state,
+@@ -3213,6 +3215,10 @@ ftrace_suspend_notifier_call(struct notifier_block *bl, unsigned long state,
return NOTIFY_DONE;
}
@@ -108472,7 +108480,7 @@ index 4872937..26ba80f 100644
int register_ftrace_graph(trace_func_graph_ret_t retfunc,
trace_func_graph_ent_t entryfunc)
{
-@@ -3226,7 +3233,6 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc,
+@@ -3226,7 +3232,6 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc,
goto out;
}