summaryrefslogtreecommitdiffstats
path: root/kernel/audit.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-09-10 23:31:17 -0700
committerEric W. Biederman <ebiederm@xmission.com>2012-09-17 18:03:59 -0700
commitf95732e2e0a649c148be0242b72e3c7473092687 (patch)
tree3bcc942e4456bc95ac43ccdf619425aa24f00873 /kernel/audit.c
parent02276bda4a2bf094fcde89fb5db4d9e86347ebf4 (diff)
downloadlinux-f95732e2e0a649c148be0242b72e3c7473092687.tar.gz
linux-f95732e2e0a649c148be0242b72e3c7473092687.tar.bz2
linux-f95732e2e0a649c148be0242b72e3c7473092687.zip
audit: kill audit_prepare_user_tty
Now that netlink messages are processed in the context of the sender tty_audit_push_task can be called directly and audit_prepare_user_tty which only added looking up the task of the tty by process id is not needed. Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Eric Paris <eparis@redhat.com> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'kernel/audit.c')
-rw-r--r--kernel/audit.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/kernel/audit.c b/kernel/audit.c
index fecb1507b485..58f704b432e4 100644
--- a/kernel/audit.c
+++ b/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;