1f88dea66c
- Updating to Sphinx v3.1.2 in Factory is exposing an issue in qemu doc sources. Fix it docs-fix-trace-docs-build-with-sphinx-3..patch - Fix DoS possibility in ati-vga emulation (CVE-2020-13800 bsc#1172495) ati-vga-check-mm_index-before-recursive-.patch - Fix DoS possibility in Network Block Device (nbd) support infrastructure (CVE-2020-10761 bsc#1172710) nbd-server-Avoid-long-error-message-asse.patch - Fix null pointer dereference possibility (DoS) in MegaRAID SAS 8708EM2 emulation (CVE-2020-13659 bsc#1172386) exec-set-map-length-to-zero-when-returni.patch - Fix OOB access possibility in MegaRAID SAS 8708EM2 emulation (CVE-2020-13362 bsc#1172383) megasas-use-unsigned-type-for-reply_queu.patch - Fix legacy IGD passthrough hw-vfio-pci-quirks-Fix-broken-legacy-IGD.patch - The latest gcc10 available in Factory has the fix for the issue this patch was created to avoid, so drop it build-Work-around-gcc10-bug-by-not-using.patch - Switch to upstream versions of some patches we carry add-enum-cast-to-avoid-gcc10-warning.patch -> golan-Add-explicit-type-casts-for-nodnic.patch Be-explicit-about-fcommon-compiler-direc.patch -> build-Be-explicit-about-fcommon-compiler.patch Do-not-apply-WORKAROUND_CFLAGS-for-host-.patch -> build-Do-not-apply-WORKAROUND_CFLAGS-for.patch Fix-s-directive-argument-is-null-error.patch -> build-Fix-s-directive-argument-is-null-e.patch Workaround-compilation-error-with-gcc-9..patch -> build-Workaround-compilation-error-with-.patch work-around-gcc10-problem-with-zero-leng.patch -> intel-Avoid-spurious-compiler-warning-on.patch - Fix vgabios issue for cirrus graphics emulation, which effectively downgraded it to standard VGA behavior vga-fix-cirrus-bios.patch - Fix OOB access possibility in ES1370 audio device emulation (CVE-2020-13361 bsc#1172384) es1370-check-total-frame-count-against-c.patch OBS-URL: https://build.opensuse.org/request/show/822154 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=553
79 lines
2.8 KiB
Diff
79 lines
2.8 KiB
Diff
From: Janosch Frank <frankja@linux.ibm.com>
|
|
Date: Wed, 31 Jul 2019 17:49:08 +0200
|
|
Subject: s390x: protvirt: Move diag 308 data over SIDA
|
|
|
|
Git-commit: 258da1c7736d3aa4604ceea6cce00995c6f30058
|
|
References: bsc#1167075
|
|
|
|
For protected guests the IPIB is written/read to/from the SIDA, so we
|
|
need those accesses to go through s390_cpu_pv_mem_read/write().
|
|
|
|
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
|
|
Reviewed-by: David Hildenbrand <david@redhat.com>
|
|
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
|
|
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
|
|
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
target/s390x/diag.c | 25 ++++++++++++++++++++-----
|
|
1 file changed, 20 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/target/s390x/diag.c b/target/s390x/diag.c
|
|
index b2cbefb8cfe4e5a244219e761fb4..1a4842956402e308426c0ed5ce5c 100644
|
|
--- a/target/s390x/diag.c
|
|
+++ b/target/s390x/diag.c
|
|
@@ -75,6 +75,7 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)
|
|
{
|
|
bool valid;
|
|
CPUState *cs = env_cpu(env);
|
|
+ S390CPU *cpu = S390_CPU(cs);
|
|
uint64_t addr = env->regs[r1];
|
|
uint64_t subcode = env->regs[r3];
|
|
IplParameterBlock *iplb;
|
|
@@ -111,13 +112,22 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)
|
|
return;
|
|
}
|
|
iplb = g_new0(IplParameterBlock, 1);
|
|
- cpu_physical_memory_read(addr, iplb, sizeof(iplb->len));
|
|
+ if (!s390_is_pv()) {
|
|
+ cpu_physical_memory_read(addr, iplb, sizeof(iplb->len));
|
|
+ } else {
|
|
+ s390_cpu_pv_mem_read(cpu, 0, iplb, sizeof(iplb->len));
|
|
+ }
|
|
+
|
|
if (!iplb_valid_len(iplb)) {
|
|
env->regs[r1 + 1] = DIAG_308_RC_INVALID;
|
|
goto out;
|
|
}
|
|
|
|
- cpu_physical_memory_read(addr, iplb, be32_to_cpu(iplb->len));
|
|
+ if (!s390_is_pv()) {
|
|
+ cpu_physical_memory_read(addr, iplb, be32_to_cpu(iplb->len));
|
|
+ } else {
|
|
+ s390_cpu_pv_mem_read(cpu, 0, iplb, be32_to_cpu(iplb->len));
|
|
+ }
|
|
|
|
valid = subcode == DIAG308_PV_SET ? iplb_valid_pv(iplb) : iplb_valid(iplb);
|
|
if (!valid) {
|
|
@@ -140,12 +150,17 @@ out:
|
|
} else {
|
|
iplb = s390_ipl_get_iplb();
|
|
}
|
|
- if (iplb) {
|
|
+ if (!iplb) {
|
|
+ env->regs[r1 + 1] = DIAG_308_RC_NO_CONF;
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ if (!s390_is_pv()) {
|
|
cpu_physical_memory_write(addr, iplb, be32_to_cpu(iplb->len));
|
|
- env->regs[r1 + 1] = DIAG_308_RC_OK;
|
|
} else {
|
|
- env->regs[r1 + 1] = DIAG_308_RC_NO_CONF;
|
|
+ s390_cpu_pv_mem_write(cpu, 0, iplb, be32_to_cpu(iplb->len));
|
|
}
|
|
+ env->regs[r1 + 1] = DIAG_308_RC_OK;
|
|
return;
|
|
case DIAG308_PV_START:
|
|
iplb = s390_ipl_get_iplb_pv();
|