upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-04-23 07:07:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

virtio_p9fs: fix panic on qemu/kvm

Browse source 
When the module is loaded on a system running on qemu/kvm the "modern"
virtio infrastructure is used and virtio_read_device_config() will end
up calling vtpci_modern_read_dev_config(). This function cannot read
values of arbitrary sizes and will panic if the p9fs mount tag size is
not supported by it.

Use virtio_read_device_config_array() instead. It was tested on both
bhyve and qemu/kvm.

PR: 280098
Co-authored-by: Mark Peek <mp@FreeBSD.org>
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1320
This commit is contained in:
Danilo Egea Gondolfo 2024-07-06 17:51:51 +01:00 committed by Franco Fichtner
parent 3e04ab7f01
commit 014dcda455
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/dev/virtio/p9fs/virtio_p9fs.c
View file

@ -352,9 +352,9 @@ vt9p_attach(device_t dev)
mount_tag = malloc(mount_tag_len + 1, M_P9FS_MNTTAG,
M_WAITOK | M_ZERO);
virtio_read_device_config(dev,
virtio_read_device_config_array(dev,
offsetof(struct virtio_9pnet_config, mount_tag),
mount_tag, mount_tag_len);
mount_tag, 1, mount_tag_len);
device_printf(dev, "Mount tag: %s\n", mount_tag);