Commit 679b8447 authored by Janosch Frank's avatar Janosch Frank Committed by Christian Borntraeger
Browse files

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: default avatarJanosch Frank <frankja@linux.ibm.com>
Reviewed-by: default avatarJason J. Herne <jjherne@linux.ibm.com>
Message-Id: <1569591203-15258-2-git-send-email-imbrenda@linux.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 7df1dac5

hw/s390x/event-facility.c

+0 −3
Original line number Diff line number Diff line
@@ -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;

    }

}

hw/s390x/sclp.c

+16 −1
Original line number Diff line number Diff line
@@ -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));