Merge tag 'v4.9.176' into v4.9-rt

This is the 4.9.176 stable release

 Conflicts:
	arch/x86/include/asm/thread_info.h
	kernel/cpu.c

Also modified kernel/irq/manage.c

1 files changed, 10 insertions, 0 deletions

diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 583ce3aad891..042efdab0d60 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -265,6 +265,9 @@ static int ptrace_check_attach(struct task_struct *child, bool ignore_state)
 
 static int ptrace_has_cap(struct user_namespace *ns, unsigned int mode)
 {
+	if (mode & PTRACE_MODE_SCHED)
+		return false;
+
 	if (mode & PTRACE_MODE_NOAUDIT)
 		return has_ns_capability_noaudit(current, ns, CAP_SYS_PTRACE);
 	else
@@ -332,9 +335,16 @@ ok:
 	     !ptrace_has_cap(mm->user_ns, mode)))
 	    return -EPERM;
 
+	if (mode & PTRACE_MODE_SCHED)
+		return 0;
 	return security_ptrace_access_check(task, mode);
 }
 
+bool ptrace_may_access_sched(struct task_struct *task, unsigned int mode)
+{
+	return __ptrace_may_access(task, mode | PTRACE_MODE_SCHED);
+}
+
 bool ptrace_may_access(struct task_struct *task, unsigned int mode)
 {
 	int err;