Skip to content

Commit

Permalink
audit: kill audit_prepare_user_tty
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eric W. Biederman committed Sep 18, 2012
1 parent 02276bd commit f95732e
Showing 1 changed file with 1 addition and 19 deletions.
20 changes: 1 addition & 19 deletions kernel/audit.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit f95732e

Please sign in to comment.