All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Peter Xu" <peterx@redhat.com>, "Bibo Mao" <maobibo@loongson.cn>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [RFC PATCH 12/12] hw/virtio: Display error if vring flag field is not aligned
Date: Thu, 20 May 2021 13:09:19 +0200	[thread overview]
Message-ID: <20210520110919.2483190-13-philmd@redhat.com> (raw)
In-Reply-To: <20210520110919.2483190-1-philmd@redhat.com>

Per the virtio spec [*] the vring is aligned, so the 'flag' field
is also 16-bit aligned. If it is not, this is a guest error, and
we'd rather report any malicious activity.

Enforce the transaction alignment by setting the 'aligned' attribute
and log unaligned addresses.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 hw/virtio/virtio.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 1b8bc194ce1..f19d12fc71e 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -291,15 +291,24 @@ static inline bool vring_avail_flags(VirtQueue *vq, uint16_t *val)
 {
     VRingMemoryRegionCaches *caches = vring_get_region_caches(vq);
     hwaddr pa = offsetof(VRingAvail, flags);
+    MemTxAttrs attrs = { .aligned = 1 };
+    MemTxResult res;
 
     if (!caches) {
         *val = 0;
         return true;
     }
 
-    *val = virtio_lduw_phys_cached_with_attrs(vq->vdev, &caches->avail, pa);
+    *val = virtio_lduw_phys_cached_with_attrs(vq->vdev, &caches->avail,
+                                              pa, attrs, &res);
+    if (res == MEMTX_UNALIGNED_ERROR) {
+        qemu_log_mask(LOG_GUEST_ERROR,
+                      "virtio: vring flag address 0x%" HWADDR_PRIX " "
+                      "is not aligned\n", pa);
+        return false;
+    }
 
-    return true;
+    return res == MEMTX_OK;
 }
 
 /* Called within rcu_read_lock().  */
-- 
2.26.3



  parent reply	other threads:[~2021-05-20 11:14 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-20 11:09 [RFC PATCH 00/12] exec/memory: Experimental API to catch unaligned accesses Philippe Mathieu-Daudé
2021-05-20 11:09 ` [RFC PATCH 01/12] exec/memory_ldst: Use correct type sizes Philippe Mathieu-Daudé
2021-05-20 11:09 ` [RFC PATCH 02/12] exec/memattrs: Add attribute/error for address alignment Philippe Mathieu-Daudé
2021-06-02 12:39   ` Stefan Hajnoczi
2021-05-20 11:09 ` [RFC PATCH 03/12] exec/memory_ldst: Return MEMTX_UNALIGNED_ERROR for unaligned addresses Philippe Mathieu-Daudé
2021-05-20 11:09 ` [RFC PATCH 04/12] exec/memory_ldst_cached: Sort declarations Philippe Mathieu-Daudé
2021-05-20 11:09 ` [RFC PATCH 05/12] exec/memory_ldst_cached: Use correct type size Philippe Mathieu-Daudé
2021-05-20 11:09 ` [RFC PATCH 06/12] exec/memory_ldst_cached: Set MemTxResult on success Philippe Mathieu-Daudé
2021-05-20 11:09 ` [RFC PATCH 07/12] exec/memory_ldst_cached: Document aligned addresses are expected Philippe Mathieu-Daudé
2021-05-20 11:09 ` [RFC PATCH 08/12] exec/memory_ldst_cached: Check address alignment if requested Philippe Mathieu-Daudé
2021-05-20 11:09 ` [RFC PATCH 09/12] hw/virtio: Use correct type sizes Philippe Mathieu-Daudé
2021-05-20 11:09 ` [RFC PATCH 10/12] hw/virtio: Extract virtio_lduw_phys_cached_with_attrs() Philippe Mathieu-Daudé
2021-05-20 11:09 ` [RFC PATCH 11/12] hw/virtio: Have vring_avail_flags() return a boolean value Philippe Mathieu-Daudé
2021-05-20 11:09 ` Philippe Mathieu-Daudé [this message]
2021-06-02 12:44   ` [RFC PATCH 12/12] hw/virtio: Display error if vring flag field is not aligned Stefan Hajnoczi
2021-06-01  3:32 ` [RFC PATCH 00/12] exec/memory: Experimental API to catch unaligned accesses Philippe Mathieu-Daudé

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=20210520110919.2483190-13-philmd@redhat.com \
    --to=philmd@redhat.com \
    --cc=maobibo@loongson.cn \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=peterx@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=stefanha@redhat.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.