From: Jiri Slaby (SUSE) <jirislaby@kernel.org>
Date: Thu, 10 Aug 2023 09:14:59 +0000 (+0200)
Subject: tty: switch size and count types in iterate_tty_read() to size_t
X-Git-Tag: v6.6-rc1~101^2~71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e3afc5b0d708e2ef389b9c7acd45d1e4fd2cb304;p=thirdparty%2Flinux.git

tty: switch size and count types in iterate_tty_read() to size_t

ld->ops->read() returns ssize_t. copy_to_iter() returns size_t. So
switch the variables ('size' and 'copied', respectively) to the
corresponding types.

This allows for use of min() in the next patch.

Signed-off-by: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20230810091510.13006-26-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index e8248773e3f02..7cfa99fbbb62f 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -850,10 +850,10 @@ static ssize_t iterate_tty_read(struct tty_ldisc *ld, struct tty_struct *tty,
 	unsigned long offset = 0;
 	char kernel_buf[64];
 	ssize_t retval = 0;
-	size_t count = iov_iter_count(to);
+	size_t copied, count = iov_iter_count(to);
 
 	do {
-		int size, copied;
+		ssize_t size;
 
 		size = count > sizeof(kernel_buf) ? sizeof(kernel_buf) : count;
 		size = ld->ops->read(tty, file, kernel_buf, size, &cookie, offset);