Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1305487
| From | Peter Hurley <peter@hurleysoftware.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v2 02/15] tty: audit: Never audit packet mode |
| Date | 2016-01-10 08:00 +0100 |
| Message-ID | <qPi8P-Fk-19@gated-at.bofh.it> (permalink) |
| References | <qPgql-84a-1@gated-at.bofh.it> <qPi8O-Fk-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
tty audit never logs pty master reads, but packet mode only works for
pty masters, so tty_audit_add_data() was never logging packet mode
anyway.
Don't audit packet mode data. As those are the lone call sites, remove
tty_put_user().
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
---
drivers/tty/n_tty.c | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index 90eca26..eeae6bc 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -153,15 +153,6 @@ static inline unsigned char *echo_buf_addr(struct n_tty_data *ldata, size_t i)
return &ldata->echo_buf[i & (N_TTY_BUF_SIZE - 1)];
}
-static inline int tty_put_user(struct tty_struct *tty, unsigned char x,
- unsigned char __user *ptr)
-{
- struct n_tty_data *ldata = tty->disc_data;
-
- tty_audit_add_data(tty, &x, 1, ldata->icanon);
- return put_user(x, ptr);
-}
-
static int tty_copy_to_user(struct tty_struct *tty, void __user *to,
size_t tail, size_t n)
{
@@ -2203,11 +2194,11 @@ static ssize_t n_tty_read(struct tty_struct *tty, struct file *file,
cs = tty->link->ctrl_status;
tty->link->ctrl_status = 0;
spin_unlock_irq(&tty->link->ctrl_lock);
- if (tty_put_user(tty, cs, b++)) {
+ if (put_user(cs, b)) {
retval = -EFAULT;
- b--;
break;
}
+ b++;
nr--;
break;
}
@@ -2253,11 +2244,11 @@ static ssize_t n_tty_read(struct tty_struct *tty, struct file *file,
/* Deal with packet mode. */
if (packet && b == buf) {
- if (tty_put_user(tty, TIOCPKT_DATA, b++)) {
+ if (put_user(TIOCPKT_DATA, b)) {
retval = -EFAULT;
- b--;
break;
}
+ b++;
nr--;
}
--
2.7.0
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[RESEND][PATCH 00/15] Rework tty audit Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 06:10 +0100
[RESEND][PATCH 11/15] tty: audit: Remove tty_audit_buf reference counting Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 06:10 +0100
[RESEND][PATCH 15/15] tty: audit: Poison tty_audit_buf while process exits Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 06:10 +0100
[RESEND][PATCH 02/15] tty: audit: Never audit packet mode Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 06:10 +0100
[RESEND][PATCH 03/15] tty: audit: Remove icanon mode from call chain Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 06:10 +0100
[RESEND][PATCH 09/15] tty: audit: Handle tty audit enable atomically Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 06:10 +0100
[RESEND][PATCH 04/15] tty: audit: Defer audit buffer association Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 06:10 +0100
[RESEND][PATCH 06/15] tty: audit: Ignore current association for audit push Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 06:10 +0100
Re: [RESEND][PATCH 06/15] tty: audit: Ignore current association for audit push kbuild test robot <lkp@intel.com> - 2016-01-10 06:40 +0100
Re: [RESEND][PATCH 06/15] tty: audit: Ignore current association for audit push Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 08:10 +0100
[RESEND][PATCH 14/15] tty: audit: Always push audit buffer before TIOCSTI Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 06:10 +0100
[RESEND][PATCH 05/15] tty: audit: Take siglock directly Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 06:10 +0100
[RESEND][PATCH 13/15] tty: audit: Check audit enable first Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 06:10 +0100
[RESEND][PATCH 12/15] tty: audit: Simplify first-use allocation Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 06:10 +0100
[RESEND][PATCH 01/15] tty: audit: Early-out pty master reads earlier Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 06:10 +0100
[RESEND][PATCH 08/15] tty: audit: Track tty association with dev_t Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 06:10 +0100
[RESEND][PATCH 07/15] tty: audit: Combine push functions Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 06:10 +0100
[RESEND][PATCH 10/15] tty: audit: Remove false memory optimization Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 06:10 +0100
[PATCH v2 12/15] tty: audit: Simplify first-use allocation Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 08:00 +0100
[PATCH v2 11/15] tty: audit: Remove tty_audit_buf reference counting Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 08:00 +0100
[PATCH v2 00/15] Rework tty audit Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 08:00 +0100
[PATCH v2 02/15] tty: audit: Never audit packet mode Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 08:00 +0100
[PATCH v2 15/15] tty: audit: Poison tty_audit_buf while process exits Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 08:00 +0100
[PATCH v2 10/15] tty: audit: Remove false memory optimization Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 08:00 +0100
[PATCH v2 09/15] tty: audit: Handle tty audit enable atomically Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 08:00 +0100
[PATCH v2 14/15] tty: audit: Always push audit buffer before TIOCSTI Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 08:00 +0100
[PATCH v2 13/15] tty: audit: Check audit enable first Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 08:00 +0100
[PATCH v2 01/15] tty: audit: Early-out pty master reads earlier Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 08:00 +0100
[PATCH v2 08/15] tty: audit: Track tty association with dev_t Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 08:00 +0100
[PATCH v2 04/15] tty: audit: Defer audit buffer association Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 08:10 +0100
[PATCH v2 03/15] tty: audit: Remove icanon mode from call chain Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 08:10 +0100
[PATCH v2 05/15] tty: audit: Take siglock directly Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 08:10 +0100
[PATCH v2 07/15] tty: audit: Combine push functions Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 08:10 +0100
[PATCH v2 06/15] tty: audit: Ignore current association for audit push Peter Hurley <peter@hurleysoftware.com> - 2016-01-10 08:10 +0100
csiph-web