aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/tty_io.c
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2013-02-15 09:25:05 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-02-15 13:52:36 -0500
commitb0de59b5733d18b0d1974a060860a8b5c1b36a2e (patch)
treeb304fafe3dcbb26212d95438fe2d98184752b9fc /drivers/tty/tty_io.c
parentcb8081cb6bfbdb867d17cafaaf3509ee31140f7f (diff)
TTY: do not update atime/mtime on read/write
On http://vladz.devzero.fr/013_ptmx-timing.php, we can see how to find out length of a password using timestamps of /dev/ptmx. It is documented in "Timing Analysis of Keystrokes and Timing Attacks on SSH". To avoid that problem, do not update time when reading from/writing to a TTY. I am afraid of regressions as this is a behavior we have since 0.97 and apps may expect the time to be current, e.g. for monitoring whether there was a change on the TTY. Now, there is no change. So this would better have a lot of testing before it goes upstream. References: CVE-2013-0160 Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: stable <stable@vger.kernel.org> # after 3.9 is out Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/tty_io.c')
-rw-r--r--drivers/tty/tty_io.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 54a254ab85c7..8f44d627ccea 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -977,8 +977,7 @@ static ssize_t tty_read(struct file *file, char __user *buf, size_t count,
977 else 977 else
978 i = -EIO; 978 i = -EIO;
979 tty_ldisc_deref(ld); 979 tty_ldisc_deref(ld);
980 if (i > 0) 980
981 inode->i_atime = current_fs_time(inode->i_sb);
982 return i; 981 return i;
983} 982}
984 983
@@ -1079,11 +1078,8 @@ static inline ssize_t do_tty_write(
1079 break; 1078 break;
1080 cond_resched(); 1079 cond_resched();
1081 } 1080 }
1082 if (written) { 1081 if (written)
1083 struct inode *inode = file->f_path.dentry->d_inode;
1084 inode->i_mtime = current_fs_time(inode->i_sb);
1085 ret = written; 1082 ret = written;
1086 }
1087out: 1083out:
1088 tty_write_unlock(tty); 1084 tty_write_unlock(tty);
1089 return ret; 1085 return ret;