From: Xie Yongji Date: Tue, 25 May 2021 12:56:22 +0000 (+0800) Subject: virtio_console: Assure used length from device is limited X-Git-Tag: v4.19.198~41 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b5fba782ccd3d12a14f884cd20f255fc9c0eec0c;p=users%2Fdwmw2%2Flinux.git virtio_console: Assure used length from device is limited [ 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 Acked-by: Jason Wang Link: https://lore.kernel.org/r/20210525125622.1203-1-xieyongji@bytedance.com Signed-off-by: Michael S. Tsirkin Signed-off-by: Sasha Levin --- diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index ca71ee939533f..cdf441942bae4 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -488,7 +488,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; } @@ -1738,7 +1738,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);