diff options
| author | Klaus Jensen <k.jensen@samsung.com> | 2021-06-07 11:47:57 +0200 |
|---|---|---|
| committer | Klaus Jensen <k.jensen@samsung.com> | 2021-06-29 07:16:25 +0200 |
| commit | 2b02aabc9d02f9e95946cf639f546bb61f1721b7 (patch) | |
| tree | 4477558343de7b3aa8e6aa47a542c89f298bb435 /hw/nvme | |
| parent | eeef43290d1598363f886acb4c78652073271011 (diff) | |
| download | qemu-2b02aabc9d02f9e95946cf639f546bb61f1721b7.zip qemu-2b02aabc9d02f9e95946cf639f546bb61f1721b7.tar.gz qemu-2b02aabc9d02f9e95946cf639f546bb61f1721b7.tar.bz2 | |
hw/nvme: fix missing check for PMR capability
Qiang Liu reported that an access on an unknown address is triggered in
memory_region_set_enabled because a check on CAP.PMRS is missing for the
PMRCTL register write when no PMR is configured.
Cc: qemu-stable@nongnu.org
Fixes: 75c3c9de961d ("hw/block/nvme: disable PMR at boot up")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/362
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Diffstat (limited to 'hw/nvme')
| -rw-r--r-- | hw/nvme/ctrl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index dd2b4fa..5c6c7d3 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -5860,6 +5860,10 @@ static void nvme_write_bar(NvmeCtrl *n, hwaddr offset, uint64_t data, "invalid write to PMRCAP register, ignored"); return; case 0xe04: /* PMRCTL */ + if (!NVME_CAP_PMRS(n->bar.cap)) { + return; + } + n->bar.pmrctl = data; if (NVME_PMRCTL_EN(data)) { memory_region_set_enabled(&n->pmr.dev->mr, true); |