diff options
| author | Klaus Jensen <k.jensen@samsung.com> | 2021-11-17 14:12:56 +0100 |
|---|---|---|
| committer | Klaus Jensen <k.jensen@samsung.com> | 2021-11-19 07:32:19 +0100 |
| commit | e2c57529c9306e4c9aac75d9879f6e7699584a22 (patch) | |
| tree | a75fc4514e0e425b406a96c544c8517ae04064f8 /hw/nvme | |
| parent | 916b0f0b5264759c581badfdc0e1c5f98362dbda (diff) | |
| download | qemu-e2c57529c9306e4c9aac75d9879f6e7699584a22.zip qemu-e2c57529c9306e4c9aac75d9879f6e7699584a22.tar.gz qemu-e2c57529c9306e4c9aac75d9879f6e7699584a22.tar.bz2 | |
hw/nvme: fix buffer overrun in nvme_changed_nslist (CVE-2021-3947)
Fix missing offset verification.
Cc: qemu-stable@nongnu.org
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Reported-by: Qiuhao Li <Qiuhao.Li@outlook.com>
Fixes: f432fdfa121 ("support changed namespace asynchronous event")
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Diffstat (limited to 'hw/nvme')
| -rw-r--r-- | hw/nvme/ctrl.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index 6a571d1..5f573c4 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -4168,6 +4168,11 @@ static uint16_t nvme_changed_nslist(NvmeCtrl *n, uint8_t rae, uint32_t buf_len, int i = 0; uint32_t nsid; + if (off >= sizeof(nslist)) { + trace_pci_nvme_err_invalid_log_page_offset(off, sizeof(nslist)); + return NVME_INVALID_FIELD | NVME_DNR; + } + memset(nslist, 0x0, sizeof(nslist)); trans_len = MIN(sizeof(nslist) - off, buf_len); |