commit:     12ed7d2e56282aae82940611e9e2ac941dc9e784
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  9 11:35:15 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jul  9 11:35:15 2016 +0000
URL:        
https://gitweb.gentoo.org/proj/hardened-patchset.git/commit/?id=12ed7d2e

grsecurity-3.1-4.6.3-201607070721

 4.6.3/0000_README                                                     | 2 +-
 ...01607062159.patch => 4420_grsecurity-3.1-4.6.3-201607070721.patch} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/4.6.3/0000_README b/4.6.3/0000_README
index 00f1875..585f483 100644
--- a/4.6.3/0000_README
+++ b/4.6.3/0000_README
@@ -6,7 +6,7 @@ Patch:  1002_linux-4.6.3.patch
 From:  http://www.kernel.org
 Desc:  Linux 4.6.3
 
-Patch: 4420_grsecurity-3.1-4.6.3-201607062159.patch
+Patch: 4420_grsecurity-3.1-4.6.3-201607070721.patch
 From:  http://www.grsecurity.net
 Desc:  hardened-sources base patch from upstream grsecurity
 

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
similarity index 99%
rename from 4.6.3/4420_grsecurity-3.1-4.6.3-201607062159.patch
rename to 4.6.3/4420_grsecurity-3.1-4.6.3-201607070721.patch
index 169d0af..b3964cb 100644
--- 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
@@ -114846,7 +114846,7 @@ index 510413eb..34d9a8c 100644
        seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
  
 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index 5415835..5c95ec4 100644
+index 5415835..0095e58 100644
 --- a/fs/proc/task_mmu.c
 +++ b/fs/proc/task_mmu.c
 @@ -15,12 +15,19 @@
@@ -114911,7 +114911,7 @@ index 5415835..5c95ec4 100644
  
        priv->inode = inode;
 -      priv->mm = proc_mem_open(inode, PTRACE_MODE_READ);
-+#ifdef CONFIG_GRKERNSEC
++#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
 +      priv->mm = proc_mem_open(inode, PTRACE_MODE_READ, 
&priv->ptracer_exec_id);
 +#else
 +      priv->mm = proc_mem_open(inode, PTRACE_MODE_READ, NULL);

Reply via email to