From 22ee6b73340ae8060c14c510ab4bd4ed0eb42677 Mon Sep 17 00:00:00 2001
From: Markus Metzger <markus.t.metzger@googlemail.com>
Date: Sat, 15 Nov 2008 11:00:17 +0100
Subject: [PATCH] --- yaml --- r: 119207 b: refs/heads/master c:
 d1f1e9c01006b4b050e090055c75278f80c2a5c5 h: refs/heads/master i:   119205:
 ae15c07a6ef723f41081372c2dce1d07b7e200fc   119203:
 be2b1edfc4208715cadf36492eb1c252e31ef7e9   119199:
 5e0b13182aaec20353173e326c3f5afa9bf912ac v: v3

---
 [refs]                     | 2 +-
 trunk/arch/x86/kernel/ds.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 70761eb234df..091d6ed62c3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cd10f8db385ba547811baa5b26f672fdff232e6
+refs/heads/master: d1f1e9c01006b4b050e090055c75278f80c2a5c5
diff --git a/trunk/arch/x86/kernel/ds.c b/trunk/arch/x86/kernel/ds.c
index 2b69994fd3a8..ac1d5b0586ba 100644
--- a/trunk/arch/x86/kernel/ds.c
+++ b/trunk/arch/x86/kernel/ds.c
@@ -384,8 +384,9 @@ static int ds_request(struct task_struct *task, void *base, size_t size,
 
 	spin_lock(&ds_lock);
 
+	error = -EPERM;
 	if (!check_tracer(task))
-		return -EPERM;
+		goto out_unlock;
 
 	error = -ENOMEM;
 	context = ds_alloc_context(task);