| CVE: CVE-2018-20191 |
| Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=2aa8645] |
| |
| Signed-off-by: Kai Kang <kai.kang@windriver.com> |
| |
| From 2aa86456fb938a11f2b7bd57c8643c213218681c Mon Sep 17 00:00:00 2001 |
| From: Prasad J Pandit <pjp@fedoraproject.org> |
| Date: Thu, 13 Dec 2018 01:00:35 +0530 |
| Subject: [PATCH] pvrdma: add uar_read routine |
| |
| Define skeleton 'uar_read' routine. Avoid NULL dereference. |
| |
| Reported-by: Li Qiang <liq3ea@163.com> |
| Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org> |
| Reviewed-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> |
| Signed-off-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> |
| --- |
| hw/rdma/vmw/pvrdma_main.c | 6 ++++++ |
| 1 file changed, 6 insertions(+) |
| |
| diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c |
| index 64de16fb52..838ad8a949 100644 |
| --- a/hw/rdma/vmw/pvrdma_main.c |
| +++ b/hw/rdma/vmw/pvrdma_main.c |
| @@ -448,6 +448,11 @@ static const MemoryRegionOps regs_ops = { |
| }, |
| }; |
| |
| +static uint64_t uar_read(void *opaque, hwaddr addr, unsigned size) |
| +{ |
| + return 0xffffffff; |
| +} |
| + |
| static void uar_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) |
| { |
| PVRDMADev *dev = opaque; |
| @@ -489,6 +494,7 @@ static void uar_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) |
| } |
| |
| static const MemoryRegionOps uar_ops = { |
| + .read = uar_read, |
| .write = uar_write, |
| .endianness = DEVICE_LITTLE_ENDIAN, |
| .impl = { |
| -- |
| 2.20.1 |
| |