tty: use min() for size computation in iterate_tty_read()

[linux-2.6-block.git] / drivers / tty / tty_io.c

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 7cfa99fbbb62f5b9773c19a1974fac7c852a7e39..4f21a21a1fd598202390086f425c99e7d95db770 100644 (file)
--- 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;