| Message ID | 1569591203-15258-2-git-send-email-imbrenda@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | s390x: SCLP error cleanup | expand |
On 27.09.19 15:33, Claudio Imbrenda wrote: > From: Janosch Frank <frankja@linux.ibm.com> > > 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> > --- > hw/s390x/event-facility.c | 3 --- > hw/s390x/sclp.c | 17 ++++++++++++++++- > 2 files changed, 16 insertions(+), 4 deletions(-) > > diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c > index 797ecbb..6620569 100644 > --- a/hw/s390x/event-facility.c > +++ b/hw/s390x/event-facility.c > @@ -377,9 +377,6 @@ static void command_handler(SCLPEventFacility *ef, SCCB *sccb, uint64_t code) > case SCLP_CMD_WRITE_EVENT_MASK: > write_event_mask(ef, sccb); > break; > - default: > - sccb->h.response_code = cpu_to_be16(SCLP_RC_INVALID_SCLP_COMMAND); > - break; > } > } > > diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c > index fac7c3b..95ebfe7 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)); > > Reviewed-by: David Hildenbrand <david@redhat.com>
On 27.09.19 15:33, Claudio Imbrenda wrote: > From: Janosch Frank <frankja@linux.ibm.com> > > 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> > --- > hw/s390x/event-facility.c | 3 --- > hw/s390x/sclp.c | 17 ++++++++++++++++- > 2 files changed, 16 insertions(+), 4 deletions(-) > > diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c > index 797ecbb..6620569 100644 > --- a/hw/s390x/event-facility.c > +++ b/hw/s390x/event-facility.c > @@ -377,9 +377,6 @@ static void command_handler(SCLPEventFacility *ef, SCCB *sccb, uint64_t code) > case SCLP_CMD_WRITE_EVENT_MASK: > write_event_mask(ef, sccb); > break; > - default: > - sccb->h.response_code = cpu_to_be16(SCLP_RC_INVALID_SCLP_COMMAND); > - break; > } > } > > diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c > index fac7c3b..95ebfe7 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)); > Thanks applied.
diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c index 797ecbb..6620569 100644 --- a/hw/s390x/event-facility.c +++ b/hw/s390x/event-facility.c @@ -377,9 +377,6 @@ static void command_handler(SCLPEventFacility *ef, SCCB *sccb, uint64_t code) case SCLP_CMD_WRITE_EVENT_MASK: write_event_mask(ef, sccb); break; - default: - sccb->h.response_code = cpu_to_be16(SCLP_RC_INVALID_SCLP_COMMAND); - break; } } diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index fac7c3b..95ebfe7 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));