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: archive/raspbian/5.10.46-5+rpi1^2~33 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=029bb62044885dde409a2acf559564b8822a7d8f;p=linux.git 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 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 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 1836cc56e35..673522874ce 100644 --- 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);