diff --git a/[refs] b/[refs]
index adaab8873bc3..0e151653daec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4136cabff33d6d73b8daf2f2612670cc0296f844
+refs/heads/master: 341c2d806b71cc3596afeb2d9bd26cd718e75202
diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c
index b7773bf68efa..b65c201e9ff5 100644
--- a/trunk/security/selinux/hooks.c
+++ b/trunk/security/selinux/hooks.c
@@ -1262,7 +1262,7 @@ static int selinux_ptrace(struct task_struct *parent, struct task_struct *child)
 
 	rc = task_has_perm(parent, child, PROCESS__PTRACE);
 	/* Save the SID of the tracing process for later use in apply_creds. */
-	if (!rc)
+	if (!(child->ptrace & PT_PTRACED) && !rc)
 		csec->ptrace_sid = psec->sid;
 	return rc;
 }