]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
xen-mapcache: Avoid entry->lock overflow stable-4.14 staging-4.14 qemu-xen-4.14.5
authorRoss Lagerwall <ross.lagerwall@citrix.com>
Mon, 24 Jan 2022 10:44:50 +0000 (10:44 +0000)
committerAnthony PERARD <anthony.perard@citrix.com>
Thu, 17 Mar 2022 11:04:59 +0000 (11:04 +0000)
In some cases, a particular mapcache entry may be mapped 256 times
causing the lock field to wrap to 0. For example, this may happen when
using emulated NVME and the guest submits a large scatter-gather write.
At this point, the entry map be remapped causing QEMU to write the wrong
data or crash (since remap is not atomic).

Avoid this overflow by increasing the lock field to a uint32_t and also
detect it and abort rather than continuing regardless.

Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
Reviewed-by: Paul Durrant <paul@xen.org>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Message-Id: <20220124104450.152481-1-ross.lagerwall@citrix.com>
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
(cherry picked from commit a021a2dd8b790437d27db95774969349632f856a)

hw/i386/xen/xen-mapcache.c

index 5b120ed44b1edefea97fcea6a725c1e505295d3b..c66f582da1844f050ac3b9a89cb0968824fb61a8 100644 (file)
@@ -52,7 +52,7 @@ typedef struct MapCacheEntry {
     hwaddr paddr_index;
     uint8_t *vaddr_base;
     unsigned long *valid_mapping;
-    uint8_t lock;
+    uint32_t lock;
 #define XEN_MAPCACHE_ENTRY_DUMMY (1 << 0)
     uint8_t flags;
     hwaddr size;
@@ -341,6 +341,12 @@ tryagain:
     if (lock) {
         MapCacheRev *reventry = g_malloc0(sizeof(MapCacheRev));
         entry->lock++;
+        if (entry->lock == 0) {
+            fprintf(stderr,
+                    "mapcache entry lock overflow: "TARGET_FMT_plx" -> %p\n",
+                    entry->paddr_index, entry->vaddr_base);
+            abort();
+        }
         reventry->dma = dma;
         reventry->vaddr_req = mapcache->last_entry->vaddr_base + address_offset;
         reventry->paddr_index = mapcache->last_entry->paddr_index;