Commit 2067d39e authored by Kevin Wolf's avatar Kevin Wolf
Browse files

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



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

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 87ad860c

hw/block/nvme.c

+0 −7
Original line number Diff line number Diff line
@@ -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;

}