From 46c35a83607c25b3ea43668fecf3b08a328956fa Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Mon, 10 Sep 2012 23:31:17 -0700
Subject: [PATCH] --- yaml --- r: 327251 b: refs/heads/master c:
 f95732e2e0a649c148be0242b72e3c7473092687 h: refs/heads/master i:   327249:
 bdae6fc950857b4533bd05444b72fd3eff5ecc67   327247:
 a78b84fd369785e7810e0669b8aba8267ac9d330 v: v3

---
 [refs]               |  2 +-
 trunk/kernel/audit.c | 20 +-------------------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index d66097b13782..095a6767f7f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02276bda4a2bf094fcde89fb5db4d9e86347ebf4
+refs/heads/master: f95732e2e0a649c148be0242b72e3c7473092687
diff --git a/trunk/kernel/audit.c b/trunk/kernel/audit.c
index fecb1507b485..58f704b432e4 100644
--- a/trunk/kernel/audit.c
+++ b/trunk/kernel/audit.c
@@ -468,24 +468,6 @@ static int kauditd_thread(void *dummy)
 	return 0;
 }
 
-static int audit_prepare_user_tty(pid_t pid, uid_t loginuid, u32 sessionid)
-{
-	struct task_struct *tsk;
-	int err;
-
-	rcu_read_lock();
-	tsk = find_task_by_vpid(pid);
-	if (!tsk) {
-		rcu_read_unlock();
-		return -ESRCH;
-	}
-	get_task_struct(tsk);
-	rcu_read_unlock();
-	err = tty_audit_push_task(tsk, loginuid, sessionid);
-	put_task_struct(tsk);
-	return err;
-}
-
 int audit_send_list(void *_dest)
 {
 	struct audit_netlink_list *dest = _dest;
@@ -748,7 +730,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 		if (err == 1) {
 			err = 0;
 			if (msg_type == AUDIT_USER_TTY) {
-				err = audit_prepare_user_tty(pid, loginuid,
+				err = tty_audit_push_task(current, loginuid,
 							     sessionid);
 				if (err)
 					break;