Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f229c2c1 authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

tty: audit: Take siglock directly 



lock_task_sighand() is for situations where the struct task_struct*
may disappear while trying to deref the sighand; this never applies
to 'current'.

Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a75c9b09

drivers/tty/tty_audit.c

+5 −8
Original line number Diff line number Diff line
@@ -180,22 +180,19 @@ void tty_audit_tiocsti(struct tty_struct *tty, char ch) 
int tty_audit_push_current(void)

{

	struct tty_audit_buf *buf = ERR_PTR(-EPERM);

	struct task_struct *tsk = current;

	unsigned long flags;



	if (!lock_task_sighand(tsk, &flags))

		return -ESRCH;



	if (tsk->signal->audit_tty) {

		buf = tsk->signal->tty_audit_buf;

	spin_lock_irqsave(&current->sighand->siglock, flags);

	if (current->signal->audit_tty) {

		buf = current->signal->tty_audit_buf;

		if (buf)

			atomic_inc(&buf->count);

	}

	unlock_task_sighand(tsk, &flags);

	spin_unlock_irqrestore(&current->sighand->siglock, flags);



	/*

	 * Return 0 when signal->audit_tty set

	 * but tsk->signal->tty_audit_buf == NULL.

	 * but current->signal->tty_audit_buf == NULL.

	 */

	if (!buf || IS_ERR(buf))

		return PTR_ERR(buf);