Commit d00d8da5 authored by Xie Yongji's avatar Xie Yongji Committed by Michael S. Tsirkin

virtio_console: Assure used length from device is limited

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: default avatarXie Yongji <xieyongji@bytedance.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Link: https://lore.kernel.org/r/20210525125622.1203-1-xieyongji@bytedance.comSigned-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 63947b34
...@@ -475,7 +475,7 @@ static struct port_buffer *get_inbuf(struct port *port) ...@@ -475,7 +475,7 @@ static struct port_buffer *get_inbuf(struct port *port)
buf = virtqueue_get_buf(port->in_vq, &len); buf = virtqueue_get_buf(port->in_vq, &len);
if (buf) { if (buf) {
buf->len = len; buf->len = min_t(size_t, len, buf->size);
buf->offset = 0; buf->offset = 0;
port->stats.bytes_received += len; port->stats.bytes_received += len;
} }
...@@ -1709,7 +1709,7 @@ static void control_work_handler(struct work_struct *work) ...@@ -1709,7 +1709,7 @@ static void control_work_handler(struct work_struct *work)
while ((buf = virtqueue_get_buf(vq, &len))) { while ((buf = virtqueue_get_buf(vq, &len))) {
spin_unlock(&portdev->c_ivq_lock); spin_unlock(&portdev->c_ivq_lock);
buf->len = len; buf->len = min_t(size_t, len, buf->size);
buf->offset = 0; buf->offset = 0;
handle_control_message(vq->vdev, portdev, buf); handle_control_message(vq->vdev, portdev, buf);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment