tty: audit: Always push audit buffer before TIOCSTI

The data read from another tty may be relevant to the action of
the TIOCSTI ioctl; log the audit buffer immediately.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/tty_audit.c b/drivers/tty/tty_audit.c
index 269e41f45832ac8a42b1837b17585959f96051cf..fa461dc5b1113d8ad39898042f4b23e3b635fda6 100644 (file)
--- a/drivers/tty/tty_audit.c
+++ b/drivers/tty/tty_audit.c
@@ -130,19 +130,13 @@ void tty_audit_fork(struct signal_struct *sig)
  */
 void tty_audit_tiocsti(struct tty_struct *tty, char ch)
 {
-       struct tty_audit_buf *buf;
        dev_t dev;
 
        dev = MKDEV(tty->driver->major, tty->driver->minor_start) + tty->index;
-       buf = current->signal->tty_audit_buf;
-       if (buf) {
-               mutex_lock(&buf->mutex);
-               if (buf->dev == dev)
-                       tty_audit_buf_push(buf);
-               mutex_unlock(&buf->mutex);
-       }
+       if (tty_audit_push())
+               return;
 
-       if (audit_enabled && (current->signal->audit_tty & AUDIT_TTY_ENABLE)) {
+       if (audit_enabled) {
                kuid_t auid;
                unsigned int sessionid;