41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
|
From 38b34a054490d7dd8a3ed6ee313c1ee501363688 Mon Sep 17 00:00:00 2001
|
||
|
|
From: dinglimin <dinglimin@cmss.chinamobile.com>
|
||
|
|
Date: Mon, 26 Aug 2024 15:27:20 +0800
|
||
|
|
Subject: [PATCH] virtio-rng: block max-bytes=0 MIME-Version: 1.0
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
cheery-pick from 024d046bf41b5256adec671085bcee767a6da125
|
||
|
|
|
||
|
|
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>
|
||
|
|
Signed-off-by: dinglimin <dinglimin@cmss.chinamobile.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 cc8e9f775d..e0f71ddd0f 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.41.0.windows.1
|
||
|
|
|