Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 1 | CVE: CVE-2018-20191 |
| 2 | Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=2aa8645] |
| 3 | |
| 4 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
| 5 | |
| 6 | From 2aa86456fb938a11f2b7bd57c8643c213218681c Mon Sep 17 00:00:00 2001 |
| 7 | From: Prasad J Pandit <pjp@fedoraproject.org> |
| 8 | Date: Thu, 13 Dec 2018 01:00:35 +0530 |
| 9 | Subject: [PATCH] pvrdma: add uar_read routine |
| 10 | |
| 11 | Define skeleton 'uar_read' routine. Avoid NULL dereference. |
| 12 | |
| 13 | Reported-by: Li Qiang <liq3ea@163.com> |
| 14 | Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org> |
| 15 | Reviewed-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> |
| 16 | Signed-off-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> |
| 17 | --- |
| 18 | hw/rdma/vmw/pvrdma_main.c | 6 ++++++ |
| 19 | 1 file changed, 6 insertions(+) |
| 20 | |
| 21 | diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c |
| 22 | index 64de16fb52..838ad8a949 100644 |
| 23 | --- a/hw/rdma/vmw/pvrdma_main.c |
| 24 | +++ b/hw/rdma/vmw/pvrdma_main.c |
| 25 | @@ -448,6 +448,11 @@ static const MemoryRegionOps regs_ops = { |
| 26 | }, |
| 27 | }; |
| 28 | |
| 29 | +static uint64_t uar_read(void *opaque, hwaddr addr, unsigned size) |
| 30 | +{ |
| 31 | + return 0xffffffff; |
| 32 | +} |
| 33 | + |
| 34 | static void uar_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) |
| 35 | { |
| 36 | PVRDMADev *dev = opaque; |
| 37 | @@ -489,6 +494,7 @@ static void uar_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) |
| 38 | } |
| 39 | |
| 40 | static const MemoryRegionOps uar_ops = { |
| 41 | + .read = uar_read, |
| 42 | .write = uar_write, |
| 43 | .endianness = DEVICE_LITTLE_ENDIAN, |
| 44 | .impl = { |
| 45 | -- |
| 46 | 2.20.1 |
| 47 | |