37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
|
From dae2e53c30574daff59c7ddf651b730a750a3623 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Thu, 26 Sep 2024 11:23:32 +0800
|
||
|
|
Subject: [PATCH] vhost-backend: avoid overflow on memslots_limit
|
||
|
|
|
||
|
|
cherry picked from commit 6dcae534e82520aa2280009de4b78a19059e8bbb
|
||
|
|
|
||
|
|
Fix the (hypothetical) potential problem when the value parsed out of
|
||
|
|
the vhost module parameter in sysfs overflows the return value from
|
||
|
|
vhost_kernel_memslots_limit.
|
||
|
|
|
||
|
|
Signed-off-by: Roman Kagan <rvkagan@yandex-team.ru>
|
||
|
|
Message-Id: <20211111153354.18807-6-rvkagan@yandex-team.ru>
|
||
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Signed-off-by: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
hw/virtio/vhost-backend.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/hw/virtio/vhost-backend.c b/hw/virtio/vhost-backend.c
|
||
|
|
index 2acfb750fd..5787775c91 100644
|
||
|
|
--- a/hw/virtio/vhost-backend.c
|
||
|
|
+++ b/hw/virtio/vhost-backend.c
|
||
|
|
@@ -60,7 +60,7 @@ static int vhost_kernel_memslots_limit(struct vhost_dev *dev)
|
||
|
|
if (g_file_get_contents("/sys/module/vhost/parameters/max_mem_regions",
|
||
|
|
&s, NULL, NULL)) {
|
||
|
|
uint64_t val = g_ascii_strtoull(s, NULL, 10);
|
||
|
|
- if (!((val == G_MAXUINT64 || !val) && errno)) {
|
||
|
|
+ if (val < INT_MAX && val > 0) {
|
||
|
|
g_free(s);
|
||
|
|
return val;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|