From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35760) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cHraN-0000he-Qu for qemu-devel@nongnu.org; Fri, 16 Dec 2016 07:26:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cHraK-0002GC-M9 for qemu-devel@nongnu.org; Fri, 16 Dec 2016 07:26:03 -0500 References: <20161216114155.18446-1-dgilbert@redhat.com> From: Paolo Bonzini Message-ID: Date: Fri, 16 Dec 2016 13:25:56 +0100 MIME-Version: 1.0 In-Reply-To: <20161216114155.18446-1-dgilbert@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [for 2.9] balloon: Don't balloon roms List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Dr. David Alan Gilbert (git)" , qemu-devel@nongnu.org, mst@redhat.com Cc: lcapitulino@redhat.com, qemu-stable On 16/12/2016 12:41, Dr. David Alan Gilbert (git) wrote: > From: "Dr. David Alan Gilbert" > > A broken guest can specify physical addresses that correspond > to any memory region, but it shouldn't be able to change ROM. > > Signed-off-by: Dr. David Alan Gilbert > --- > hw/virtio/trace-events | 2 ++ > hw/virtio/virtio-balloon.c | 7 ++++++- > 2 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events > index 7b6f55e..6926eed 100644 > --- a/hw/virtio/trace-events > +++ b/hw/virtio/trace-events > @@ -15,6 +15,8 @@ virtio_rng_pushed(void *rng, size_t len) "rng %p: %zd bytes pushed" > virtio_rng_request(void *rng, size_t size, unsigned quota) "rng %p: %zd bytes requested, %u bytes quota left" > > # hw/virtio/virtio-balloon.c > +# > +virtio_balloon_bad_addr(uint64_t gpa) "%"PRIx64 > virtio_balloon_handle_output(const char *name, uint64_t gpa) "section name: %s gpa: %"PRIx64 > virtio_balloon_get_config(uint32_t num_pages, uint32_t actual) "num_pages: %d actual: %d" > virtio_balloon_set_config(uint32_t actual, uint32_t oldactual) "actual: %d oldactual: %d" > diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c > index 884570a..a705e0e 100644 > --- a/hw/virtio/virtio-balloon.c > +++ b/hw/virtio/virtio-balloon.c > @@ -228,8 +228,13 @@ static void virtio_balloon_handle_output(VirtIODevice *vdev, VirtQueue *vq) > > /* FIXME: remove get_system_memory(), but how? */ > section = memory_region_find(get_system_memory(), pa, 1); > - if (!int128_nz(section.size) || !memory_region_is_ram(section.mr)) > + if (!int128_nz(section.size) || > + !memory_region_is_ram(section.mr) || > + memory_region_is_rom(section.mr) || > + memory_region_is_romd(section.mr)) { > + trace_virtio_balloon_bad_addr(pa); > continue; > + } > > trace_virtio_balloon_handle_output(memory_region_name(section.mr), > pa); > Acked-by: Paolo Bonzini Cc: qemu-stable@nongnu.org