8abcb1d6b2
Include security fixes and other recent "stable" fixes OBS-URL: https://build.opensuse.org/request/show/664459 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=445
42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
From: Prasad J Pandit <pjp@fedoraproject.org>
|
|
Date: Thu, 13 Dec 2018 01:00:35 +0530
|
|
Subject: 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>
|
|
(cherry picked from commit 2aa86456fb938a11f2b7bd57c8643c213218681c)
|
|
[BR: BSC#1119979 CVE-2018-20191]
|
|
Signed-off-by: Bruce Rogers <brogers@suse.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 34d8cc4694..c9d9631769 100644
|
|
--- a/hw/rdma/vmw/pvrdma_main.c
|
|
+++ b/hw/rdma/vmw/pvrdma_main.c
|
|
@@ -455,6 +455,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;
|
|
@@ -496,6 +501,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 = {
|