virtio_console: Assure used length from device is limited

Origin: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit?id=f6ec306b93dc600a0ab3bb2693568ef1cc5f7f7a
Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2021-38160

[ Upstream commit d00d8da5869a2608e97cfede094dfc5e11462a46 ]

The buf->len might come from an untrusted device. This
ensures the value would not exceed the size of the buffer
to avoid data corruption or loss.

Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Link: https://lore.kernel.org/r/20210525125622.1203-1-xieyongji@bytedance.com
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Gbp-Pq: Topic bugfix/all
Gbp-Pq: Name virtio_console-Assure-used-length-from-device-is-lim.patch

diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 1836cc56e357b7b428808e5a0d32163e68f2e491..673522874cec43e6e502b83c9795978671c0ef96 100644 (file)
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -475,7 +475,7 @@ static struct port_buffer *get_inbuf(struct port *port)
 
        buf = virtqueue_get_buf(port->in_vq, &len);
        if (buf) {
-               buf->len = len;
+               buf->len = min_t(size_t, len, buf->size);
                buf->offset = 0;
                port->stats.bytes_received += len;
        }
@@ -1712,7 +1712,7 @@ static void control_work_handler(struct work_struct *work)
        while ((buf = virtqueue_get_buf(vq, &len))) {
                spin_unlock(&portdev->c_ivq_lock);
 
-               buf->len = len;
+               buf->len = min_t(size_t, len, buf->size);
                buf->offset = 0;
 
                handle_control_message(vq->vdev, portdev, buf);