From: Sasha Levin <sashal@kernel.org>
Date: Mon, 20 Jan 2020 03:27:35 +0000 (-0500)
Subject: fixes for 4.14
X-Git-Tag: v4.4.211~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=539cdbf49d4c334673853e37202d3f8efac73770;p=thirdparty%2Fkernel%2Fstable-queue.git

fixes for 4.14

Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/queue-4.14/ptrace-reintroduce-usage-of-subjective-credentials-in-ptrace_has_cap.patch b/queue-4.14/ptrace-reintroduce-usage-of-subjective-credentials-in-ptrace_has_cap.patch
index 1222ae4171e..927ca46f78f 100644
--- a/queue-4.14/ptrace-reintroduce-usage-of-subjective-credentials-in-ptrace_has_cap.patch
+++ b/queue-4.14/ptrace-reintroduce-usage-of-subjective-credentials-in-ptrace_has_cap.patch
@@ -71,10 +71,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +
  	if (mode & PTRACE_MODE_NOAUDIT)
 -		return has_ns_capability_noaudit(current, ns, CAP_SYS_PTRACE);
-+		ret = security_capable(cred, ns, CAP_SYS_PTRACE, CAP_OPT_NOAUDIT);
++		ret = security_capable(cred, ns, CAP_SYS_PTRACE);
  	else
 -		return has_ns_capability(current, ns, CAP_SYS_PTRACE);
-+		ret = security_capable(cred, ns, CAP_SYS_PTRACE, CAP_OPT_NONE);
++		ret = security_capable(cred, ns, CAP_SYS_PTRACE);
 +
 +	return ret == 0;
  }