qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: P J P <ppandit@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
	"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 v2 9/9] memory: assert MemoryRegionOps callbacks are defined
Date: Thu, 25 Jun 2020 00:25:23 +0530	[thread overview]
Message-ID: <20200624185523.762240-10-ppandit@redhat.com> (raw)
In-Reply-To: <20200624185523.762240-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>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
---
 memory.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

Update v2: assert read/write_with_attrs methods
  -> https://lists.gnu.org/archive/html/qemu-devel/2020-06/msg05717.html

diff --git a/memory.c b/memory.c
index 2f15a4b250..3d635a1bca 100644
--- a/memory.c
+++ b/memory.c
@@ -1496,7 +1496,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;
 }
@@ -1674,6 +1680,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-06-24 19:06 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-24 18:55 [PATCH v2 0/9] memory: assert and define MemoryRegionOps callbacks P J P
2020-06-24 18:55 ` [PATCH v2 1/9] hw/pci-host: add pci-intack write method P J P
2020-06-29  9:20   ` Li Qiang
2020-06-24 18:55 ` [PATCH v2 2/9] pci-host: add pcie-msi read method P J P
2020-06-29  9:30   ` Li Qiang
2020-06-24 18:55 ` [PATCH v2 3/9] vfio: add quirk device write method P J P
2020-06-29  9:36   ` Li Qiang
2020-06-24 18:55 ` [PATCH v2 4/9] prep: add ppc-parity " P J P
2020-06-25  1:40   ` David Gibson
2020-06-25  6:24   ` Philippe Mathieu-Daudé
2020-06-29 11:22   ` Li Qiang
2020-07-21  8:24     ` Philippe Mathieu-Daudé
2020-06-24 18:55 ` [PATCH v2 5/9] nvram: add nrf51_soc flash read method P J P
2020-06-29 11:17   ` Li Qiang
2020-06-29 11:55     ` P J P
2020-06-29 15:32       ` Paolo Bonzini
2020-06-29 16:05         ` Li Qiang
2020-06-29 15:31     ` Paolo Bonzini
2020-07-16 16:27     ` Peter Maydell
2020-07-21  6:47       ` P J P
2020-07-21  8:33         ` Philippe Mathieu-Daudé
2020-07-21  9:48           ` P J P
2020-06-24 18:55 ` [PATCH v2 6/9] spapr_pci: add spapr msi " P J P
2020-06-25  1:41   ` David Gibson
2020-06-29  9:55     ` Li Qiang
2020-06-24 18:55 ` [PATCH v2 7/9] tz-ppc: add dummy read/write methods P J P
2020-06-25  6:29   ` Philippe Mathieu-Daudé
2020-06-25  9:18     ` P J P
2020-06-25 10:21       ` Philippe Mathieu-Daudé
2020-06-25 11:24         ` P J P
2020-06-29 15:33         ` Paolo Bonzini
2020-06-25 12:22       ` Peter Maydell
2020-06-29 10:44         ` Li Qiang
2020-06-29 11:48           ` P J P
2020-06-24 18:55 ` [PATCH v2 8/9] imx7-ccm: add digprog mmio write method P J P
2020-06-29 10:47   ` Li Qiang
2020-06-24 18:55 ` P J P [this message]
2020-06-29 11:28   ` [PATCH v2 9/9] memory: assert MemoryRegionOps callbacks are defined Li Qiang
2020-06-24 21:35 ` [PATCH v2 0/9] memory: assert and define MemoryRegionOps callbacks no-reply

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=20200624185523.762240-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).