aboutsummaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorMiloslav Trmac <mitr@redhat.com>2008-10-13 10:35:15 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-13 09:51:39 -0700
commit7459b6ff36ab5e7d160980c3cb2be2f8cd194778 (patch)
tree0cac8e47e2f4242aed9dcb124007b5f6e9c8cf8c /drivers/char
parent9d020a2e5fd2c79f5b08a6cab2b02e7231d7cb84 (diff)
audit: Handle embedded NUL in TTY input auditing
Data read from a TTY can contain an embedded NUL byte (e.g. after pressing Ctrl-2, or sent to a PTY). After the previous patch, the data would be logged only up to the first NUL. This patch modifies the AUDIT_TTY record to always use the hexadecimal format, which does not terminate at the first NUL byte. The vast majority of recorded TTY input data will contain either ' ' or '\n', so the hexadecimal format would have been used anyway. Signed-off-by: Miloslav Trmac <mitr@redhat.com> Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/tty_audit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tty_audit.c b/drivers/char/tty_audit.c
index 3582f43345a..5787249934c 100644
--- a/drivers/char/tty_audit.c
+++ b/drivers/char/tty_audit.c
@@ -93,7 +93,7 @@ static void tty_audit_buf_push(struct task_struct *tsk, uid_t loginuid,
get_task_comm(name, tsk);
audit_log_untrustedstring(ab, name);
audit_log_format(ab, " data=");
- audit_log_n_untrustedstring(ab, buf->data, buf->valid);
+ audit_log_n_hex(ab, buf->data, buf->valid);
audit_log_end(ab);
}
buf->valid = 0;