qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: P J P <ppandit@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>,
	Paolo Bonzini <pbonzini@redhat.com>
Cc: "Prasad J Pandit" <pjp@fedoraproject.org>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Li Qiang" <liq3ea@gmail.com>,
	"QEMU Developers" <qemu-devel@nongnu.org>,
	"Lei Sun" <slei.casper@gmail.com>,
	"Alex Williamson" <alex.williamson@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"David Gibson" <david@gibson.dropbear.id.au>
Subject: [PATCH v4 9/9] memory: assert MemoryRegionOps callbacks are defined
Date: Tue, 11 Aug 2020 17:11:33 +0530	[thread overview]
Message-ID: <20200811114133.672647-10-ppandit@redhat.com> (raw)
In-Reply-To: <20200811114133.672647-1-ppandit@redhat.com>

From: Prasad J Pandit <pjp@fedoraproject.org>

When registering a MemoryRegionOps object, assert that its
read/write callback methods are defined. This avoids potential
guest crash via a NULL pointer dereference.

Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
---
 softmmu/memory.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

Update v4: add Reviewed-by tag
  -> https://lists.nongnu.org/archive/html/qemu-devel/2020-07/msg05324.html

diff --git a/softmmu/memory.c b/softmmu/memory.c
index af25987518..1f4b37b3a6 100644
--- a/softmmu/memory.c
+++ b/softmmu/memory.c
@@ -1485,7 +1485,13 @@ void memory_region_init_io(MemoryRegion *mr,
                            uint64_t size)
 {
     memory_region_init(mr, owner, name, size);
-    mr->ops = ops ? ops : &unassigned_mem_ops;
+    if (ops) {
+        assert(ops->read || ops->read_with_attrs);
+        assert(ops->write || ops->write_with_attrs);
+        mr->ops = ops;
+    } else {
+        mr->ops = &unassigned_mem_ops;
+    }
     mr->opaque = opaque;
     mr->terminates = true;
 }
@@ -1663,6 +1669,8 @@ void memory_region_init_rom_device_nomigrate(MemoryRegion *mr,
 {
     Error *err = NULL;
     assert(ops);
+    assert(ops->read || ops->read_with_attrs);
+    assert(ops->write || ops->write_with_attrs);
     memory_region_init(mr, owner, name, size);
     mr->ops = ops;
     mr->opaque = opaque;
-- 
2.26.2



  parent reply	other threads:[~2020-08-11 11:49 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-11 11:41 [PATCH v4 0/9] memory: assert and define MemoryRegionOps callbacks P J P
2020-08-11 11:41 ` [PATCH v4 1/9] hw/pci-host: add pci-intack write method P J P
2020-08-11 11:41 ` [PATCH v4 2/9] pci-host: designware: add pcie-msi read method P J P
2020-08-11 11:41 ` [PATCH v4 3/9] vfio: add quirk device write method P J P
2020-08-11 11:41 ` [PATCH v4 4/9] prep: add ppc-parity " P J P
2020-08-11 15:48   ` Li Qiang
2020-08-11 11:41 ` [PATCH v4 5/9] nvram: add nrf51_soc flash read method P J P
2020-08-11 15:42   ` Li Qiang
2020-08-11 11:41 ` [PATCH v4 6/9] spapr_pci: add spapr msi " P J P
2020-08-11 14:07   ` Philippe Mathieu-Daudé
2020-08-11 17:04     ` P J P
2020-08-11 11:41 ` [PATCH v4 7/9] tz-ppc: add dummy read/write methods P J P
2020-08-11 15:39   ` Li Qiang
2020-08-11 11:41 ` [PATCH v4 8/9] imx7-ccm: add digprog mmio write method P J P
2020-08-11 11:41 ` P J P [this message]
2020-09-16 14:17   ` [PATCH v4 9/9] memory: assert MemoryRegionOps callbacks are defined Philippe Mathieu-Daudé
2020-09-30  6:05     ` P J P
2020-08-13  6:36 ` [PATCH v4 0/9] memory: assert and define MemoryRegionOps callbacks David Gibson
2020-08-13 13:43   ` P J P
2020-08-13 15:01     ` Philippe Mathieu-Daudé
2020-08-16 16:27 ` Philippe Mathieu-Daudé
2020-08-17  5:02   ` P J P
2020-08-17  5:26     ` Philippe Mathieu-Daudé
2020-08-17 17:38       ` P J P
2020-08-27 12:08         ` P J P
2020-09-03 18:36           ` P J P
2020-09-15 13:33 ` P J P
2020-11-25 13:50   ` P J P
2021-02-02 16:40     ` Paolo Bonzini

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=20200811114133.672647-10-ppandit@redhat.com \
    --to=ppandit@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=alex.williamson@redhat.com \
    --cc=david@gibson.dropbear.id.au \
    --cc=liq3ea@gmail.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@redhat.com \
    --cc=pjp@fedoraproject.org \
    --cc=qemu-devel@nongnu.org \
    --cc=slei.casper@gmail.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).