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

tty: audit: Check audit enable first 



Audit is unlikely to be enabled; check first to exit asap.

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

drivers/tty/tty_audit.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -211,6 +211,10 @@ void tty_audit_add_data(struct tty_struct *tty, const void *data, size_t size) 
	unsigned int audit_tty;

	unsigned int audit_tty;

	dev_t dev;

	dev_t dev;





	audit_tty = READ_ONCE(current->signal->audit_tty);

	if (~audit_tty & AUDIT_TTY_ENABLE)

		return;



	if (unlikely(size == 0))

	if (unlikely(size == 0))

		return;

		return;
@@ -218,9 +222,6 @@ void tty_audit_add_data(struct tty_struct *tty, const void *data, size_t size) 
	    && tty->driver->subtype == PTY_TYPE_MASTER)

	    && tty->driver->subtype == PTY_TYPE_MASTER)

		return;

		return;





	audit_tty = READ_ONCE(current->signal->audit_tty);

	if (~audit_tty & AUDIT_TTY_ENABLE)

		return;

	if ((~audit_tty & AUDIT_TTY_LOG_PASSWD) && icanon && !L_ECHO(tty))

	if ((~audit_tty & AUDIT_TTY_LOG_PASSWD) && icanon && !L_ECHO(tty))

		return;

		return;