diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2012-08-08 09:39:02 -0400 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2012-08-08 09:39:02 -0400 |
| commit | b566b5323313fbc1c413c0107f6128788112d140 (patch) | |
| tree | bad9dddf2e5a669dc672967bacb501a6e9446c36 | |
| parent | 3.5.0/4480_fix-scsi-lpfc-Werror.patch: fixed upstream (diff) | |
| download | hardened-patchset-b566b5323313fbc1c413c0107f6128788112d140.tar.gz hardened-patchset-b566b5323313fbc1c413c0107f6128788112d140.tar.bz2 hardened-patchset-b566b5323313fbc1c413c0107f6128788112d140.zip | |
Grsec/PaX: 2.9.1-3.5.0-20120807191620120807
| -rw-r--r-- | 3.5.0/0000_README | 2 | ||||
| -rw-r--r-- | 3.5.0/4420_grsecurity-2.9.1-3.5.0-201208071916.patch (renamed from 3.5.0/4420_grsecurity-2.9.1-3.5.0-201208062017.patch) | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/3.5.0/0000_README b/3.5.0/0000_README index a5de680..930961a 100644 --- a/3.5.0/0000_README +++ b/3.5.0/0000_README @@ -2,7 +2,7 @@ README ----------------------------------------------------------------------------- Individual Patch Descriptions: ----------------------------------------------------------------------------- -Patch: 4420_grsecurity-2.9.1-3.5.0-201208062017.patch +Patch: 4420_grsecurity-2.9.1-3.5.0-201208071916.patch From: http://www.grsecurity.net Desc: hardened-sources base patch from upstream grsecurity diff --git a/3.5.0/4420_grsecurity-2.9.1-3.5.0-201208062017.patch b/3.5.0/4420_grsecurity-2.9.1-3.5.0-201208071916.patch index 6efae83..de80999 100644 --- a/3.5.0/4420_grsecurity-2.9.1-3.5.0-201208062017.patch +++ b/3.5.0/4420_grsecurity-2.9.1-3.5.0-201208071916.patch @@ -70124,7 +70124,7 @@ index c0bd030..62a1927 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 a008663..d363254 100644 +index a008663..30d7429 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -1785,12 +1785,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec) @@ -70156,6 +70156,17 @@ index a008663..d363254 100644 { struct ftrace_func_probe *entry; struct ftrace_page *pg; +@@ -3697,8 +3702,10 @@ static int ftrace_process_locs(struct module *mod, + if (!count) + return 0; + ++ pax_open_kernel(); + sort(start, count, sizeof(*start), + ftrace_cmp_ips, ftrace_swap_ips); ++ pax_close_kernel(); + + start_pg = ftrace_allocate_pages(count); + if (!start_pg) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index a7fa070..403bc8d 100644 --- a/kernel/trace/trace.c |