From 4b24b29e696ee7e8f3f2b96984040ba6ab410943 Mon Sep 17 00:00:00 2001
From: Kees Cook <keescook@chromium.org>
Date: Mon, 27 Aug 2012 11:38:13 -0700
Subject: [PATCH] --- yaml --- r: 329100 b: refs/heads/master c:
 2e4930eb7c8fb20a39dfb5f8a8f80402710dcea8 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/security/yama/yama_lsm.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b6fa288e2c04..64679b413ddb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6993e4ac002c92bc75379212e9179c36d4bf7ee
+refs/heads/master: 2e4930eb7c8fb20a39dfb5f8a8f80402710dcea8
diff --git a/trunk/security/yama/yama_lsm.c b/trunk/security/yama/yama_lsm.c
index 9ca43c1ea630..01d3b44b62c1 100644
--- a/trunk/security/yama/yama_lsm.c
+++ b/trunk/security/yama/yama_lsm.c
@@ -143,7 +143,7 @@ int yama_task_prctl(int option, unsigned long arg2, unsigned long arg3,
 		if (arg2 == 0) {
 			yama_ptracer_del(NULL, myself);
 			rc = 0;
-		} else if (arg2 == PR_SET_PTRACER_ANY) {
+		} else if (arg2 == PR_SET_PTRACER_ANY || (int)arg2 == -1) {
 			rc = yama_ptracer_add(NULL, myself);
 		} else {
 			struct task_struct *tracer;