From: Jiri Slaby (SUSE) Date: Thu, 10 Aug 2023 09:15:00 +0000 (+0200) Subject: tty: use min() for size computation in iterate_tty_read() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=48a6ab8867eff61fa11d9e8f8e1c7327b135e689;p=linux.git tty: use min() for size computation in iterate_tty_read() The computation is more obvious with min(). Signed-off-by: "Jiri Slaby (SUSE)" Link: https://lore.kernel.org/r/20230810091510.13006-27-jirislaby@kernel.org Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 7cfa99fbbb62f..4f21a21a1fd59 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -853,9 +853,8 @@ static ssize_t iterate_tty_read(struct tty_ldisc *ld, struct tty_struct *tty, size_t copied, count = iov_iter_count(to); do { - ssize_t size; + ssize_t size = min(count, sizeof(kernel_buf)); - size = count > sizeof(kernel_buf) ? sizeof(kernel_buf) : count; size = ld->ops->read(tty, file, kernel_buf, size, &cookie, offset); if (!size) break;