[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 12/24] libvhost-user: prevent over-running max RAM slots
From: |
Michael S. Tsirkin |
Subject: |
[PULL v2 12/24] libvhost-user: prevent over-running max RAM slots |
Date: |
Sun, 6 Feb 2022 04:38:17 -0500 |
From: Raphael Norwitz <raphael.norwitz@nutanix.com>
When VHOST_USER_PROTOCOL_F_CONFIGURE_MEM_SLOTS support was added to
libvhost-user, no guardrails were added to protect against QEMU
attempting to hot-add too many RAM slots to a VM with a libvhost-user
based backed attached.
This change adds the missing error handling by introducing a check on
the number of RAM slots the device has available before proceeding to
process the VHOST_USER_ADD_MEM_REG message.
Suggested-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Raphael Norwitz <raphael.norwitz@nutanix.com>
Message-Id: <20220117041050.19718-6-raphael.norwitz@nutanix.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
subprojects/libvhost-user/libvhost-user.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/subprojects/libvhost-user/libvhost-user.c
b/subprojects/libvhost-user/libvhost-user.c
index 3f4d7221ca..2a1fa00a44 100644
--- a/subprojects/libvhost-user/libvhost-user.c
+++ b/subprojects/libvhost-user/libvhost-user.c
@@ -705,6 +705,14 @@ vu_add_mem_reg(VuDev *dev, VhostUserMsg *vmsg) {
return false;
}
+ if (dev->nregions == VHOST_USER_MAX_RAM_SLOTS) {
+ close(vmsg->fds[0]);
+ vu_panic(dev, "failing attempt to hot add memory via "
+ "VHOST_USER_ADD_MEM_REG message because the backend has "
+ "no free ram slots available");
+ return false;
+ }
+
/*
* If we are in postcopy mode and we receive a u64 payload with a 0 value
* we know all the postcopy client bases have been received, and we
--
MST
- [PULL v2 03/24] tests: acpi: manually pad OEM_ID/OEM_TABLE_ID for test_oem_fields() test, (continued)
- [PULL v2 03/24] tests: acpi: manually pad OEM_ID/OEM_TABLE_ID for test_oem_fields() test, Michael S. Tsirkin, 2022/02/06
- [PULL v2 06/24] tests: acpi: update expected blobs, Michael S. Tsirkin, 2022/02/06
- [PULL v2 05/24] acpi: fix OEM ID/OEM Table ID padding, Michael S. Tsirkin, 2022/02/06
- [PULL v2 10/24] libvhost-user: Simplify VHOST_USER_REM_MEM_REG, Michael S. Tsirkin, 2022/02/06
- [PULL v2 02/24] hw/i386: Add the possibility to disable the 'isapc' machine, Michael S. Tsirkin, 2022/02/06
- [PULL v2 04/24] tests: acpi: whitelist nvdimm's SSDT and FACP.slic expected blobs, Michael S. Tsirkin, 2022/02/06
- [PULL v2 09/24] libvhost-user: Add vu_add_mem_reg input validation, Michael S. Tsirkin, 2022/02/06
- [PULL v2 13/24] libvhost-user: handle removal of identical regions, Michael S. Tsirkin, 2022/02/06
- [PULL v2 08/24] libvhost-user: Add vu_rem_mem_reg input validation, Michael S. Tsirkin, 2022/02/06
- [PULL v2 01/24] cpuid: use unsigned for max cpuid, Michael S. Tsirkin, 2022/02/06
- [PULL v2 12/24] libvhost-user: prevent over-running max RAM slots,
Michael S. Tsirkin <=
- [PULL v2 14/24] libvhost-user: Map shared RAM with MAP_NORESERVE to support virtio-mem with hugetlb, Michael S. Tsirkin, 2022/02/06
- [PULL v2 15/24] ACPI ERST: bios-tables-test.c steps 1 and 2, Michael S. Tsirkin, 2022/02/06
- [PULL v2 16/24] ACPI ERST: PCI device_id for ERST, Michael S. Tsirkin, 2022/02/06
- [PULL v2 17/24] ACPI ERST: header file for ERST, Michael S. Tsirkin, 2022/02/06
- [PULL v2 19/24] ACPI ERST: build the ACPI ERST table, Michael S. Tsirkin, 2022/02/06
- [PULL v2 18/24] ACPI ERST: support for ACPI ERST feature, Michael S. Tsirkin, 2022/02/06
- [PULL v2 20/24] ACPI ERST: create ACPI ERST table for pc/x86 machines, Michael S. Tsirkin, 2022/02/06
- [PULL v2 21/24] ACPI ERST: qtest for ERST, Michael S. Tsirkin, 2022/02/06
- [PULL v2 22/24] ACPI ERST: bios-tables-test testcase, Michael S. Tsirkin, 2022/02/06
- [PULL v2 24/24] util/oslib-posix: Fix missing unlock in the error path of os_mem_prealloc(), Michael S. Tsirkin, 2022/02/06