diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-08-29 11:35:37 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-09-13 19:08:46 +0200 |
| commit | 65a8e1f6413a0f6f79894da710b5d6d43361d27d (patch) | |
| tree | 07f052999d73deb9237c544e8daaecbbbeb113dd /hw | |
| parent | cf2bce203a45d7437029d108357fb23fea0967b6 (diff) | |
| download | qemu-65a8e1f6413a0f6f79894da710b5d6d43361d27d.zip qemu-65a8e1f6413a0f6f79894da710b5d6d43361d27d.tar.gz qemu-65a8e1f6413a0f6f79894da710b5d6d43361d27d.tar.bz2 | |
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: Tom Victor <i-tangtianwen@360.cm>
Cc: qemu-stable@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/scsi/mptconfig.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/scsi/mptconfig.c b/hw/scsi/mptconfig.c index 3e4f400..87a416a 100644 --- a/hw/scsi/mptconfig.c +++ b/hw/scsi/mptconfig.c @@ -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); } |