virtio-scsi: Fix num_queue input validation
We need to count the ctrlq and eventq, and also cleanup before returning. Besides, the format string should be unsigned. The number could never be less than zero. Signed-off-by: Fam Zheng <famz@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
fb7b5c0df6
commit
0ba1f53191
@ -804,10 +804,11 @@ void virtio_scsi_common_realize(DeviceState *dev, Error **errp,
|
||||
virtio_init(vdev, "virtio-scsi", VIRTIO_ID_SCSI,
|
||||
sizeof(VirtIOSCSIConfig));
|
||||
|
||||
if (s->conf.num_queues <= 0 || s->conf.num_queues > VIRTIO_PCI_QUEUE_MAX) {
|
||||
error_setg(errp, "Invalid number of queues (= %" PRId32 "), "
|
||||
if (s->conf.num_queues == 0 ||
|
||||
s->conf.num_queues > VIRTIO_PCI_QUEUE_MAX - 2) {
|
||||
error_setg(errp, "Invalid number of queues (= %" PRIu32 "), "
|
||||
"must be a positive integer less than %d.",
|
||||
s->conf.num_queues, VIRTIO_PCI_QUEUE_MAX);
|
||||
s->conf.num_queues, VIRTIO_PCI_QUEUE_MAX - 2);
|
||||
virtio_cleanup(vdev);
|
||||
return;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user