diff options
| author | Janosch Frank | 2019-09-27 15:33:20 +0200 |
|---|---|---|
| committer | Christian Borntraeger | 2019-09-30 13:51:49 +0200 |
| commit | 679b844756e4eaa1b94bb82f52ec9f999dc4f851 (patch) | |
| tree | f8224f0747d0a7f914bad2df5d5861410ac2f923 /hw/s390x/sclp.c | |
| parent | s390: PCI: fix IOMMU region init (diff) | |
| download | qemu-679b844756e4eaa1b94bb82f52ec9f999dc4f851.tar.gz qemu-679b844756e4eaa1b94bb82f52ec9f999dc4f851.tar.xz qemu-679b844756e4eaa1b94bb82f52ec9f999dc4f851.zip | |
s390x: sclp: refactor invalid command check
Invalid command checking has to be done before the boundary check,
refactoring it now allows to insert the boundary check at the correct
place later.
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: Jason J. Herne <jjherne@linux.ibm.com>
Message-Id: <1569591203-15258-2-git-send-email-imbrenda@linux.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'hw/s390x/sclp.c')
| -rw-r--r-- | hw/s390x/sclp.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index fac7c3bb6c..95ebfe7bd2 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -219,8 +219,23 @@ int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code) goto out; } - sclp_c->execute(sclp, &work_sccb, code); + switch (code & SCLP_CMD_CODE_MASK) { + case SCLP_CMDW_READ_SCP_INFO: + case SCLP_CMDW_READ_SCP_INFO_FORCED: + case SCLP_CMDW_READ_CPU_INFO: + case SCLP_CMDW_CONFIGURE_IOA: + case SCLP_CMDW_DECONFIGURE_IOA: + case SCLP_CMD_READ_EVENT_DATA: + case SCLP_CMD_WRITE_EVENT_DATA: + case SCLP_CMD_WRITE_EVENT_MASK: + break; + default: + work_sccb.h.response_code = cpu_to_be16(SCLP_RC_INVALID_SCLP_COMMAND); + goto out_write; + } + sclp_c->execute(sclp, &work_sccb, code); +out_write: cpu_physical_memory_write(sccb, &work_sccb, be16_to_cpu(work_sccb.h.length)); |