Commit 65a8e1f6 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

scsi: mptconfig: fix misuse of MPTSAS_CONFIG_PACK 



These issues cause respectively a QEMU crash and a leak of 2 bytes of
stack.  They were discovered by VictorV of 360 Marvel Team.

Reported-by: default avatarTom Victor <i-tangtianwen@360.cm>
Cc: qemu-stable@nongnu.org
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent cf2bce20

hw/scsi/mptconfig.c

+2 −2
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ size_t mptsas_config_manufacturing_1(MPTSASState *s, uint8_t **data, int address 
{

    /* VPD - all zeros */

    return MPTSAS_CONFIG_PACK(1, MPI_CONFIG_PAGETYPE_MANUFACTURING, 0x00,

                              "s256");

                              "*s256");

}



static
@@ -328,7 +328,7 @@ size_t mptsas_config_ioc_0(MPTSASState *s, uint8_t **data, int address) 
    return MPTSAS_CONFIG_PACK(0, MPI_CONFIG_PAGETYPE_IOC, 0x01,

                              "*l*lwwb*b*b*blww",

                              pcic->vendor_id, pcic->device_id, pcic->revision,

                              pcic->subsystem_vendor_id,

                              pcic->class_id, pcic->subsystem_vendor_id,

                              pcic->subsystem_id);

}