fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hw/s390x/sclp: Do not ignore address_space_read/write() errors

Browse source 
If address_space_read() fails, return PGM_ADDRESSING. In the
unlikely case address_space_write() fails (we already checked
the address is readable), return PGM_PROTECTION.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Jason J. Herne <jjherne@linux.ibm.com>
Message-Id: <20251007015802.24748-1-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2025-10-07 03:55:08 +02:00
parent fc08d5f699
commit d39ac36fe2
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
hw/s390x/sclp.c
View file

@ -306,6 +306,7 @@ int sclp_service_call(S390CPU *cpu, uint64_t sccb, uint32_t code)
g_autofree SCCB *work_sccb = NULL;
AddressSpace *as = CPU(cpu)->as;
const MemTxAttrs attrs = MEMTXATTRS_UNSPECIFIED;
MemTxResult ret;
/* first some basic checks on program checks */
if (env->psw.mask & PSW_MASK_PSTATE) {
@ -320,7 +321,10 @@ int sclp_service_call(S390CPU *cpu, uint64_t sccb, uint32_t code)
}
/* the header contains the actual length of the sccb */
address_space_read(as, sccb, attrs, &header, sizeof(SCCBHeader));
ret = address_space_read(as, sccb, attrs, &header, sizeof(SCCBHeader));
if (ret != MEMTX_OK) {
return -PGM_ADDRESSING;
}
/* Valid sccb sizes */
if (be16_to_cpu(header.length) < sizeof(SCCBHeader)) {
@ -333,7 +337,11 @@ int sclp_service_call(S390CPU *cpu, uint64_t sccb, uint32_t code)
* the host has checked the values
*/
work_sccb = g_malloc0(be16_to_cpu(header.length));
address_space_read(as, sccb, attrs, work_sccb, be16_to_cpu(header.length));
ret = address_space_read(as, sccb, attrs,
work_sccb, be16_to_cpu(header.length));
if (ret != MEMTX_OK) {
return -PGM_ADDRESSING;
}
if (!sclp_command_code_valid(code)) {
work_sccb->h.response_code = cpu_to_be16(SCLP_RC_INVALID_SCLP_COMMAND);
@ -347,7 +355,11 @@ int sclp_service_call(S390CPU *cpu, uint64_t sccb, uint32_t code)
sclp_c->execute(sclp, work_sccb, code);
out_write:
address_space_write(as, sccb, attrs, work_sccb, be16_to_cpu(header.length));
ret = address_space_write(as, sccb, attrs,
work_sccb, be16_to_cpu(header.length));
if (ret != MEMTX_OK) {
return -PGM_PROTECTION;
}
sclp_c->service_interrupt(sclp, sccb);