11aadaf893
- python/aqmp: use absolute import statement - sysemu: Cleanup qemu_run_machine_init_done_notifiers() - vhost-backend: avoid overflow on memslots_limit - hw/i386/vmmouse: Require 'i8042' property to be set - hw/scsi/megasas: Fails command if SGL buffer overflows - target/i386/kvm: Replace use of __u32 type - hw/avr: Realize AVRCPU qdev object using qdev_realize() - qemu-keymap: Add license in generated files - configure: Symlink binaries using .exe suffix with MinGW - ui: remove break after g_assert_not_reached() - io/channel-websock: Replace strlen(const_str) by sizeof(const_str) - 1 - target/ppc: Add HASHKEYR and HASHPKEYR SPRs - tests: Fix error strings - Hexagon (target/hexagon) remove unused encodings - target/i386: introduce insn_get_addr - target/i386: REPZ and REPNZ are mutually exclusive - target/i386: correctly mask SSE4a bit indices in register operands - bios-tables-test: Make oem-fields tests be consistent - tests/vm: update NetBSD to 9.3 - monitor/hmp-cmds: Avoid displaying bogus size in 'info pci' When BAR aren't mapped, we get: - virtio-mem: don't warn about THP sizes on a kernel without THP Support - Subject: [PATCH] kvm: Use 'unsigned long' for request argument in functions wrapping ioctl() Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 2430c96ac522f910c11eb98c2d9f74c2c3336a00)
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
|
|
|