From: Raphael Norwitz <raphael.norwitz@nutanix.com>
To: "stefanha@redhat.com" <stefanha@redhat.com>,
"marcandre.lureau@redhat.com" <marcandre.lureau@redhat.com>,
"mst@redhat.com" <mst@redhat.com>,
"david@redhat.com" <david@redhat.com>
Cc: "raphael.s.norwitz@gmail.com" <raphael.s.norwitz@gmail.com>,
"qemu-devel@nongnu.org" <qemu-devel@nongnu.org>,
Raphael Norwitz <raphael.norwitz@nutanix.com>
Subject: [PATCH v2 4/5] libvhost-user: prevent over-running max RAM slots
Date: Thu, 6 Jan 2022 06:47:35 +0000 [thread overview]
Message-ID: <20220106064717.7477-5-raphael.norwitz@nutanix.com> (raw)
In-Reply-To: <20220106064717.7477-1-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>
---
subprojects/libvhost-user/libvhost-user.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/subprojects/libvhost-user/libvhost-user.c b/subprojects/libvhost-user/libvhost-user.c
index 77ddc96ddf..0fe3aa155b 100644
--- a/subprojects/libvhost-user/libvhost-user.c
+++ b/subprojects/libvhost-user/libvhost-user.c
@@ -690,6 +690,11 @@ vu_add_mem_reg(VuDev *dev, VhostUserMsg *vmsg) {
VuDevRegion *dev_region = &dev->regions[dev->nregions];
void *mmap_addr;
+ if (dev->nregions == VHOST_USER_MAX_RAM_SLOTS) {
+ vu_panic(dev, "No free ram slots available");
+ return false;
+ }
+
if (vmsg->fd_num != 1 ||
vmsg->size != sizeof(vmsg->payload.memreg)) {
vu_panic(dev, "VHOST_USER_REM_MEM_REG received multiple regions");
--
2.20.1
next prev parent reply other threads:[~2022-01-06 6:57 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-06 6:47 [PATCH v2 0/5] Clean up error handling in libvhost-user memory mapping Raphael Norwitz
2022-01-06 6:47 ` [PATCH v2 1/5] libvhost-user: Add vu_rem_mem_reg input validation Raphael Norwitz
2022-01-10 8:56 ` David Hildenbrand
2022-01-10 9:36 ` Michael S. Tsirkin
2022-01-10 19:43 ` Raphael Norwitz
2022-01-10 21:11 ` Michael S. Tsirkin
2022-01-11 9:13 ` Stefan Hajnoczi
2022-01-06 6:47 ` [PATCH v2 2/5] libvhost-user: Add vu_add_mem_reg " Raphael Norwitz
2022-01-10 8:56 ` David Hildenbrand
2022-01-06 6:47 ` [PATCH v2 3/5] libvhost-user: Simplify VHOST_USER_REM_MEM_REG Raphael Norwitz
2022-01-06 6:47 ` Raphael Norwitz [this message]
2022-01-10 8:57 ` [PATCH v2 4/5] libvhost-user: prevent over-running max RAM slots David Hildenbrand
2022-01-10 9:40 ` Michael S. Tsirkin
2022-01-10 22:38 ` Raphael Norwitz
2022-01-10 11:24 ` Stefan Hajnoczi
2022-01-06 6:47 ` [PATCH v2 5/5] libvhost-user: handle removal of identical regions Raphael Norwitz
2022-01-10 8:58 ` David Hildenbrand
2022-01-10 22:38 ` Raphael Norwitz
2022-01-10 11:25 ` Stefan Hajnoczi
2022-01-10 9:01 ` [PATCH v2 0/5] Clean up error handling in libvhost-user memory mapping David Hildenbrand
2022-01-10 22:36 ` Raphael Norwitz
2022-01-10 11:25 ` Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220106064717.7477-5-raphael.norwitz@nutanix.com \
--to=raphael.norwitz@nutanix.com \
--cc=david@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=raphael.s.norwitz@gmail.com \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).