From: Li Qiang <liq3ea@gmail.com>
To: mst@redhat.com, ehabkost@redhat.com, marcandre.lureau@gmail.com,
lersek@redhat.com, peter.maydell@linaro.org, pbonzini@redhat.com,
ppandit@redhat.com
Cc: qemu-devel@nongnu.org, Li Qiang <liq3ea@gmail.com>
Subject: [Qemu-devel] [PATCH] memory region: check the old.mmio.read status
Date: Wed, 12 Sep 2018 05:32:09 -0700 [thread overview]
Message-ID: <1536755529-2709-1-git-send-email-liq3ea@gmail.com> (raw)
To avoid NULL-deref for the devices without read callbacks
Signed-off-by: Li Qiang <liq3ea@gmail.com>
---
memory.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/memory.c b/memory.c
index 9b73892768..48d025426b 100644
--- a/memory.c
+++ b/memory.c
@@ -406,6 +406,10 @@ static MemTxResult memory_region_oldmmio_read_accessor(MemoryRegion *mr,
{
uint64_t tmp;
+ if (!mr->ops->old_mmio.read[ctz32(size)]) {
+ return MEMTX_DECODE_ERROR;
+ }
+
tmp = mr->ops->old_mmio.read[ctz32(size)](mr->opaque, addr);
if (mr->subpage) {
trace_memory_region_subpage_read(get_cpu_index(), mr, addr, tmp, size);
--
2.11.0
next reply other threads:[~2018-09-12 12:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-12 12:32 Li Qiang [this message]
2018-09-12 12:54 ` [Qemu-devel] [PATCH] memory region: check the old.mmio.read status Peter Maydell
2018-09-12 14:28 ` Li Qiang
2018-09-12 17:45 ` Laszlo Ersek
2018-09-12 17:43 ` Laszlo Ersek
2018-09-13 0:31 ` Peter Maydell
2018-09-13 1:36 ` Li Qiang
2018-09-13 4:31 ` Mark Cave-Ayland
2018-09-13 4:45 ` Peter Maydell
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=1536755529-2709-1-git-send-email-liq3ea@gmail.com \
--to=liq3ea@gmail.com \
--cc=ehabkost@redhat.com \
--cc=lersek@redhat.com \
--cc=marcandre.lureau@gmail.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=ppandit@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).