- up to 4.4.180

diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 13d5116d1185ec04cfaaa644a7a3fdf30bb93398..69d9d5857e749d779e692af37a4989e8cac9b585 100644 (file)
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -13576,14 +13576,14 @@ diff -NurpP --minimal linux-4.4.161/kernel/ptrace.c linux-4.4.161-vs2.3.9.8/kern
  #include <linux/hw_breakpoint.h>
  #include <linux/cn_proc.h>
  #include <linux/compat.h>
-@@ -295,6 +296,11 @@ ok:
-            !ptrace_has_cap(mm->user_ns, mode)))
-           return -EPERM;
+@@ -301,6 +301,11 @@ ok:
  
+       if (mode & PTRACE_MODE_SCHED)
+               return 0;
 +      if (!vx_check(task->xid, VS_ADMIN_P|VS_WATCH_P|VS_IDENT))
 +              return -EPERM;
 +      if (!vx_check(task->xid, VS_IDENT) &&
-+              !task_vx_flags(task, VXF_STATE_ADMIN, 0))
++                      !task_vx_flags(task, VXF_STATE_ADMIN, 0))
 +              return -EACCES;
        return security_ptrace_access_check(task, mode);
  }

diff --git a/kernel.spec b/kernel.spec
index 4de9b073e1258ed1e1eb8ce60a08bfa89045b17d..ecb72f558f41e032f53afd77733da2d08213a7c5 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -72,7 +72,7 @@
 
 %define                rel             1
 %define                basever         4.4
-%define                postver         .179
+%define                postver         .180
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       -%{basever}
@@ -124,7 +124,7 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
 # Source0-md5: 9a78fa2eb6c68ca5a40ed5af08142599
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:  21e6a41f56f4cc8792a53372c9388c4b
+# Patch0-md5:  1fa369af2dc1a90b1113dc0100c19b2b
 %endif
 Source1:       kernel.sysconfig