forked from rpms/qemu-kvm
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
50 lines
1.9 KiB
50 lines
1.9 KiB
1 month ago
|
From 3dd1412176a8ee6c06b5d41aa00ca49b535d99b7 Mon Sep 17 00:00:00 2001
|
||
|
From: "Michael S. Tsirkin" <mst@redhat.com>
|
||
|
Date: Wed, 24 Jul 2024 06:48:59 -0400
|
||
|
Subject: [PATCH 092/100] virtio-rng: block max-bytes=0
|
||
|
MIME-Version: 1.0
|
||
|
Content-Type: text/plain; charset=UTF-8
|
||
|
Content-Transfer-Encoding: 8bit
|
||
|
|
||
|
RH-Author: Laurent Vivier <lvivier@redhat.com>
|
||
|
RH-MergeRequest: 259: virtio-rng: block max-bytes=0
|
||
|
RH-Jira: RHEL-50336
|
||
|
RH-Acked-by: Eugenio Pérez <eperezma@redhat.com>
|
||
|
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
||
|
RH-Acked-by: Eric Auger <eric.auger@redhat.com>
|
||
|
RH-Commit: [1/1] 6d9852cc7cf7fdf49521b6301ceda26e11b1291f (lvivier/qemu-kvm-centos)
|
||
|
|
||
|
JIRA: https://issues.redhat.com/browse/RHEL-50336
|
||
|
|
||
|
with max-bytes set to 0, quota is 0 and so device does not work.
|
||
|
block this to avoid user confusion
|
||
|
|
||
|
Message-Id: <73a89a42d82ec8b47358f25119b87063e4a6ea57.1721818306.git.mst@redhat.com>
|
||
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
||
|
(cherry picked from commit 024d046bf41b5256adec671085bcee767a6da125)
|
||
|
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
||
|
---
|
||
|
hw/virtio/virtio-rng.c | 5 +++--
|
||
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
||
|
diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c
|
||
|
index f74efffef7..7cf31da071 100644
|
||
|
--- a/hw/virtio/virtio-rng.c
|
||
|
+++ b/hw/virtio/virtio-rng.c
|
||
|
@@ -184,8 +184,9 @@ static void virtio_rng_device_realize(DeviceState *dev, Error **errp)
|
||
|
|
||
|
/* Workaround: Property parsing does not enforce unsigned integers,
|
||
|
* So this is a hack to reject such numbers. */
|
||
|
- if (vrng->conf.max_bytes > INT64_MAX) {
|
||
|
- error_setg(errp, "'max-bytes' parameter must be non-negative, "
|
||
|
+ if (vrng->conf.max_bytes == 0 ||
|
||
|
+ vrng->conf.max_bytes > INT64_MAX) {
|
||
|
+ error_setg(errp, "'max-bytes' parameter must be positive, "
|
||
|
"and less than 2^63");
|
||
|
return;
|
||
|
}
|
||
|
--
|
||
|
2.39.3
|
||
|
|