From: Kevin Wolf <kwolf@redhat.com>
Date: Thu, 22 Nov 2018 14:52:20 +0000 (+0100)
Subject: Revert "nvme: fix oob access issue(CVE-2018-16847)"
X-Git-Tag: v3.1.0-rc3~13^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2067d39e5e53b053bece6fa15711640123c119ed;p=thirdparty%2Fqemu.git

Revert "nvme: fix oob access issue(CVE-2018-16847)"

This reverts commit 5e3c0220d7e4f0361c4d36c697a8842f2b583402.
We have a better fix commited for this now.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 8c35cab2b43..84062d388f3 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -1177,10 +1177,6 @@ static void nvme_cmb_write(void *opaque, hwaddr addr, uint64_t data,
     unsigned size)
 {
     NvmeCtrl *n = (NvmeCtrl *)opaque;
-
-    if (addr + size > NVME_CMBSZ_GETSIZE(n->bar.cmbsz)) {
-        return;
-    }
     memcpy(&n->cmbuf[addr], &data, size);
 }
 
@@ -1189,9 +1185,6 @@ static uint64_t nvme_cmb_read(void *opaque, hwaddr addr, unsigned size)
     uint64_t val;
     NvmeCtrl *n = (NvmeCtrl *)opaque;
 
-    if (addr + size > NVME_CMBSZ_GETSIZE(n->bar.cmbsz)) {
-        return 0;
-    }
     memcpy(&val, &n->cmbuf[addr], size);
     return val;
 }