ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtio: disallow late feature changes for virtio-1 

For virtio-1 devices, the driver must not attempt to set feature bits
after it set FEATURES_OK in the device status. Simply reject it in
that case.

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Cornelia Huck 2015-06-04 12:34:14 +02:00 committed by Michael S. Tsirkin
parent f5a5628cf0
commit 6c0196d702
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/virtio/virtio.c
View File

@ -1021,7 +1021,7 @@ void virtio_save(VirtIODevice *vdev, QEMUFile *f)
vmstate_save_state(f, &vmstate_virtio, vdev, NULL); vmstate_save_state(f, &vmstate_virtio, vdev, NULL);
} }
int virtio_set_features(VirtIODevice *vdev, uint64_t val) static int virtio_set_features_nocheck(VirtIODevice *vdev, uint64_t val)
{ {
VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev); VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev);
bool bad = (val & ~(vdev->host_features)) != 0; bool bad = (val & ~(vdev->host_features)) != 0;
@ -1034,6 +1034,18 @@ int virtio_set_features(VirtIODevice *vdev, uint64_t val)
return bad ? -1 : 0; return bad ? -1 : 0;
} }
int virtio_set_features(VirtIODevice *vdev, uint64_t val)
{
/*
* The driver must not attempt to set features after feature negotiation
* has finished.
*/
if (vdev->status & VIRTIO_CONFIG_S_FEATURES_OK) {
return -EINVAL;
}
return virtio_set_features_nocheck(vdev, val);
}
int virtio_load(VirtIODevice *vdev, QEMUFile *f, int version_id) int virtio_load(VirtIODevice *vdev, QEMUFile *f, int version_id)
{ {
int i, ret; int i, ret;
@ -1137,14 +1149,14 @@ int virtio_load(VirtIODevice *vdev, QEMUFile *f, int version_id)
* host_features. * host_features.
*/ */
uint64_t features64 = vdev->guest_features; uint64_t features64 = vdev->guest_features;
if (virtio_set_features(vdev, features64) < 0) { if (virtio_set_features_nocheck(vdev, features64) < 0) {
error_report("Features 0x%" PRIx64 " unsupported. " error_report("Features 0x%" PRIx64 " unsupported. "
"Allowed features: 0x%" PRIx64, "Allowed features: 0x%" PRIx64,
features64, vdev->host_features); features64, vdev->host_features);
return -1; return -1;
} }
} else { } else {
if (virtio_set_features(vdev, features) < 0) { if (virtio_set_features_nocheck(vdev, features) < 0) {
error_report("Features 0x%x unsupported. " error_report("Features 0x%x unsupported. "
"Allowed features: 0x%" PRIx64, "Allowed features: 0x%" PRIx64,
features, vdev->host_features); features, vdev->host_features);