| From | "Jiri Slaby (SUSE)" <> | Subject | [PATCH 26/36] tty: use min() for size computation in iterate_tty_read() | Date | Thu, 10 Aug 2023 11:15:00 +0200 |
| |
The computation is more obvious with min().
Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org> --- drivers/tty/tty_io.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 7cfa99fbbb62..4f21a21a1fd5 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; -- 2.41.0
|