Commit 00bff392c81e4fb1901e5160fdd5afdb2546a6ab

Authored by Xiaotian Feng
Committed by Greg Kroah-Hartman
1 parent b71dc88734

tty_audit: fix tty_audit_add_data live lock on audit disabled

The current tty_audit_add_data code:

        do {
                size_t run;

                run = N_TTY_BUF_SIZE - buf->valid;
                if (run > size)
                        run = size;
                memcpy(buf->data + buf->valid, data, run);
                buf->valid += run;
                data += run;
                size -= run;
                if (buf->valid == N_TTY_BUF_SIZE)
                        tty_audit_buf_push_current(buf);
        } while (size != 0);

If the current buffer is full, kernel will then call tty_audit_buf_push_current
to empty the buffer. But if we disabled audit at the same time, tty_audit_buf_push()
returns immediately if audit_enabled is zero.  Without emptying the buffer.
With obvious effect on tty_audit_add_data() that ends up spinning in that loop,
copying 0 bytes at each iteration and attempting to push each time without any effect.
Holding the lock all along.

Suggested-by: Alexander Viro <aviro@redhat.com>
Signed-off-by: Xiaotian Feng <dfeng@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 1 changed file with 3 additions and 1 deletions Side-by-side Diff

drivers/tty/tty_audit.c
... ... @@ -95,8 +95,10 @@
95 95 {
96 96 if (buf->valid == 0)
97 97 return;
98   - if (audit_enabled == 0)
  98 + if (audit_enabled == 0) {
  99 + buf->valid = 0;
99 100 return;
  101 + }
100 102 tty_audit_log("tty", tsk, loginuid, sessionid, buf->major, buf->minor,
101 103 buf->data, buf->valid);
102 104 buf->valid = 0;