Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c884f871 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

tty: use 64-bit timstamp 



The automated VFS conversion to timespec64 has left one caller of
the deprecated get_seconds() function in the tty driver, this cleans
it up to call ktime_get_real_seconds() instead, fixing the possible
overflow.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fb7f1bf8

drivers/tty/tty_io.c

+5 −14
Original line number Diff line number Diff line
@@ -814,9 +814,9 @@ void start_tty(struct tty_struct *tty) 
}

EXPORT_SYMBOL(start_tty);



static void tty_update_time(struct timespec *time)

static void tty_update_time(struct timespec64 *time)

{

	unsigned long sec = get_seconds();

	time64_t sec = ktime_get_real_seconds();



	/*

	 * We only care if the two values differ in anything other than the
@@ -867,13 +867,8 @@ static ssize_t tty_read(struct file *file, char __user *buf, size_t count, 
		i = -EIO;

	tty_ldisc_deref(ld);



	if (i > 0) {

		struct timespec ts;



		ts = timespec64_to_timespec(inode->i_atime);

		tty_update_time(&ts);

		inode->i_atime = timespec_to_timespec64(ts);

	}

	if (i > 0)

		tty_update_time(&inode->i_atime);



	return i;

}
@@ -974,11 +969,7 @@ static inline ssize_t do_tty_write( 
		cond_resched();

	}

	if (written) {

		struct timespec ts;



		ts = timespec64_to_timespec(file_inode(file)->i_mtime);

		tty_update_time(&ts);

		file_inode(file)->i_mtime = timespec_to_timespec64(ts);

		tty_update_time(&file_inode(file)->i_mtime);

		ret = written;

	}

out: