From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Subject: [PULL 7/8] memory: Do not allow direct write access to rom_device regions
Date: Sat, 11 Apr 2020 09:03:29 -0400 [thread overview]
Message-ID: <20200411130330.1993-8-pbonzini@redhat.com> (raw)
In-Reply-To: <20200411130330.1993-1-pbonzini@redhat.com>
From: Alexander Duyck <alexander.h.duyck@linux.intel.com>
According to the documentation in memory.h a ROM memory region will be
backed by RAM for reads, but is supposed to go through a callback for
writes. Currently we were not checking for the existence of the rom_device
flag when determining if we could perform a direct write or not.
To correct that add a check to memory_region_is_direct so that if the
memory region has the rom_device flag set we will return false for all
checks where is_write is set.
Signed-off-by: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Message-Id: <20200410034150.24738.98143.stgit@localhost.localdomain>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
include/exec/memory.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/exec/memory.h b/include/exec/memory.h
index 1614d9a02c..e000bd2f97 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -2351,8 +2351,8 @@ void address_space_write_cached_slow(MemoryRegionCache *cache,
static inline bool memory_access_is_direct(MemoryRegion *mr, bool is_write)
{
if (is_write) {
- return memory_region_is_ram(mr) &&
- !mr->readonly && !memory_region_is_ram_device(mr);
+ return memory_region_is_ram(mr) && !mr->readonly &&
+ !mr->rom_device && !memory_region_is_ram_device(mr);
} else {
return (memory_region_is_ram(mr) && !memory_region_is_ram_device(mr)) ||
memory_region_is_romd(mr);
--
2.18.2
next prev parent reply other threads:[~2020-04-11 13:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-11 13:03 [PULL 0/8] Misc patches for QEMU 5.0-rc3 Paolo Bonzini
2020-04-11 13:03 ` [PULL 1/8] piix: fix xenfv regression, add compat machine xenfv-4.2 Paolo Bonzini
2020-04-11 13:03 ` [PULL 2/8] oslib-posix: take lock before qemu_cond_broadcast Paolo Bonzini
2020-04-11 13:03 ` [PULL 3/8] atomics: convert to reStructuredText Paolo Bonzini
2020-04-11 13:03 ` [PULL 4/8] atomics: update documentation Paolo Bonzini
2020-04-11 13:03 ` [PULL 5/8] rcu: do not mention atomic_mb_read/set in documentation Paolo Bonzini
2020-04-11 13:03 ` [PULL 6/8] vl.c: error out if -mem-path is used together with -M memory-backend Paolo Bonzini
2020-04-11 13:03 ` Paolo Bonzini [this message]
2020-04-11 13:03 ` [PULL 8/8] module: increase dirs array size by one Paolo Bonzini
2020-04-11 16:54 ` [PULL 0/8] Misc patches for QEMU 5.0-rc3 Peter Maydell
2020-04-14 7:36 ` Igor Mammedov
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=20200411130330.1993-8-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=alexander.h.duyck@linux.intel.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).