From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Fri, 17 May 2019 07:12:19 +0000 (+0200)
Subject: - up to 4.4.180
X-Git-Tag: auto/th/kernel-4.4-4.4.180-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=fc310d5897315b403a5e4fc1a27557eb0c5261ad;p=packages%2Fkernel.git

- up to 4.4.180
---

diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 13d5116d..69d9d585 100644
--- 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 4de9b073..ecb72f55 100644
--- 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