From c425c64b5c36eb0a4903cdc813813393663973cd Mon Sep 17 00:00:00 2001
From: "J.R. Mauro" <jrm8005@gmail.com>
Date: Mon, 5 Jan 2009 17:08:53 -0500
Subject: [PATCH] --- yaml --- r: 126769 b: refs/heads/master c:
 9279bcc31698842961a30bb05b00aef7236dd728 h: refs/heads/master i:   126767:
 cffd151b836c33a37f86fa4326212bbf7412fd2b v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/staging/android/binder.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 2867a44954a7..558ff8f1dd9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2bf2153cb2a2de341b6a87cb644870a5bde2a9d
+refs/heads/master: 9279bcc31698842961a30bb05b00aef7236dd728
diff --git a/trunk/drivers/staging/android/binder.c b/trunk/drivers/staging/android/binder.c
index 765048eaaf6d..7c3da5aa777a 100644
--- a/trunk/drivers/staging/android/binder.c
+++ b/trunk/drivers/staging/android/binder.c
@@ -1401,7 +1401,7 @@ binder_transaction(struct binder_proc *proc, struct binder_thread *thread,
 		t->from = thread;
 	else
 		t->from = NULL;
-	t->sender_euid = proc->tsk->euid;
+	t->sender_euid = proc->tsk->cred->euid;
 	t->to_proc = target_proc;
 	t->to_thread = target_thread;
 	t->code = tr->code;
@@ -2593,16 +2593,16 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 			goto err;
 		}
 		if (binder_context_mgr_uid != -1) {
-			if (binder_context_mgr_uid != current->euid) {
+			if (binder_context_mgr_uid != current->cred->euid) {
 				printk(KERN_ERR "binder: BINDER_SET_"
 				       "CONTEXT_MGR bad uid %d != %d\n",
-				       current->euid,
+				       current->cred->euid,
 				       binder_context_mgr_uid);
 				ret = -EPERM;
 				goto err;
 			}
 		} else
-			binder_context_mgr_uid = current->euid;
+			binder_context_mgr_uid = current->cred->euid;
 		binder_context_mgr_node = binder_new_node(proc, NULL, NULL);
 		if (binder_context_mgr_node == NULL) {
 			ret = -ENOMEM;