Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/hardened-patchset:master commit in: 4.6.3/
Date: Sat, 09 Jul 2016 11:33:28
Message-Id: 1468064115.12ed7d2e56282aae82940611e9e2ac941dc9e784.blueness@gentoo
1 commit: 12ed7d2e56282aae82940611e9e2ac941dc9e784
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 9 11:35:15 2016 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 9 11:35:15 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/hardened-patchset.git/commit/?id=12ed7d2e
7
8 grsecurity-3.1-4.6.3-201607070721
9
10 4.6.3/0000_README | 2 +-
11 ...01607062159.patch => 4420_grsecurity-3.1-4.6.3-201607070721.patch} | 4 ++--
12 2 files changed, 3 insertions(+), 3 deletions(-)
13
14 diff --git a/4.6.3/0000_README b/4.6.3/0000_README
15 index 00f1875..585f483 100644
16 --- a/4.6.3/0000_README
17 +++ b/4.6.3/0000_README
18 @@ -6,7 +6,7 @@ Patch: 1002_linux-4.6.3.patch
19 From: http://www.kernel.org
20 Desc: Linux 4.6.3
21
22 -Patch: 4420_grsecurity-3.1-4.6.3-201607062159.patch
23 +Patch: 4420_grsecurity-3.1-4.6.3-201607070721.patch
24 From: http://www.grsecurity.net
25 Desc: hardened-sources base patch from upstream grsecurity
26
27
28 diff --git a/4.6.3/4420_grsecurity-3.1-4.6.3-201607062159.patch b/4.6.3/4420_grsecurity-3.1-4.6.3-201607070721.patch
29 similarity index 99%
30 rename from 4.6.3/4420_grsecurity-3.1-4.6.3-201607062159.patch
31 rename to 4.6.3/4420_grsecurity-3.1-4.6.3-201607070721.patch
32 index 169d0af..b3964cb 100644
33 --- a/4.6.3/4420_grsecurity-3.1-4.6.3-201607062159.patch
34 +++ b/4.6.3/4420_grsecurity-3.1-4.6.3-201607070721.patch
35 @@ -114846,7 +114846,7 @@ index 510413eb..34d9a8c 100644
36 seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
37
38 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
39 -index 5415835..5c95ec4 100644
40 +index 5415835..0095e58 100644
41 --- a/fs/proc/task_mmu.c
42 +++ b/fs/proc/task_mmu.c
43 @@ -15,12 +15,19 @@
44 @@ -114911,7 +114911,7 @@ index 5415835..5c95ec4 100644
45
46 priv->inode = inode;
47 - priv->mm = proc_mem_open(inode, PTRACE_MODE_READ);
48 -+#ifdef CONFIG_GRKERNSEC
49 ++#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
50 + priv->mm = proc_mem_open(inode, PTRACE_MODE_READ, &priv->ptracer_exec_id);
51 +#else
52 + priv->mm = proc_mem_open(inode, PTRACE_MODE_READ, NULL);