From: David Hildenbrand <david@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Michael S . Tsirkin" <mst@redhat.com>,
Igor Mammedov <imammedo@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
Michael Roth <mdroth@linux.vnet.ibm.com>,
David Gibson <david@gibson.dropbear.id.au>,
Eduardo Habkost <ehabkost@redhat.com>,
"Dr . David Alan Gilbert" <dgilbert@redhat.com>,
David Hildenbrand <david@redhat.com>
Subject: [Qemu-devel] [PATCH v2 6/7] memory-device: avoid overflows on very huge devices
Date: Fri, 12 Oct 2018 13:49:15 +0200 [thread overview]
Message-ID: <20181012114916.23532-7-david@redhat.com> (raw)
In-Reply-To: <20181012114916.23532-1-david@redhat.com>
Should not be a problem right now, but it could theoretically happen
in the future.
Signed-off-by: David Hildenbrand <david@redhat.com>
---
hw/mem/memory-device.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c
index 996ad1490f..8be63c8032 100644
--- a/hw/mem/memory-device.c
+++ b/hw/mem/memory-device.c
@@ -85,7 +85,8 @@ static void memory_device_check_addable(MachineState *ms, uint64_t size,
/* will we exceed the total amount of memory specified */
memory_device_used_region_size(OBJECT(ms), &used_region_size);
- if (used_region_size + size > ms->maxram_size - ms->ram_size) {
+ if (used_region_size + size < used_region_size ||
+ used_region_size + size > ms->maxram_size - ms->ram_size) {
error_setg(errp, "not enough space, currently 0x%" PRIx64
" in use of total space for memory devices 0x" RAM_ADDR_FMT,
used_region_size, ms->maxram_size - ms->ram_size);
--
2.17.1
next prev parent reply other threads:[~2018-10-12 11:49 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-12 11:49 [Qemu-devel] [PATCH v2 0/7] qapi/range/memory-device: fixes and cleanups David Hildenbrand
2018-10-12 11:49 ` [Qemu-devel] [PATCH v2 1/7] qapi: correctly parse uint64_t values from strings David Hildenbrand
2018-10-17 12:42 ` Markus Armbruster
2018-10-23 12:10 ` David Hildenbrand
2018-10-23 15:07 ` David Hildenbrand
2018-10-12 11:49 ` [Qemu-devel] [PATCH v2 2/7] qapi: use qemu_strtoi64() in parse_str_int64 David Hildenbrand
2018-10-12 11:49 ` [Qemu-devel] [PATCH v2 3/7] range: pass const pointer where possible David Hildenbrand
2018-10-12 11:49 ` [Qemu-devel] [PATCH v2 4/7] range: add some more functions David Hildenbrand
2018-10-12 11:49 ` [Qemu-devel] [PATCH v2 5/7] memory-device: use QEMU_IS_ALIGNED David Hildenbrand
2018-10-12 11:49 ` David Hildenbrand [this message]
2018-10-12 11:49 ` [Qemu-devel] [PATCH v2 7/7] memory-device: rewrite address assignment using ranges David Hildenbrand
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=20181012114916.23532-7-david@redhat.com \
--to=david@redhat.com \
--cc=armbru@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=dgilbert@redhat.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).