[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/12] s390x: sclp: Report insufficient SCCB length
From: |
Christian Borntraeger |
Subject: |
[PULL 06/12] s390x: sclp: Report insufficient SCCB length |
Date: |
Mon, 30 Sep 2019 15:19:49 +0200 |
From: Claudio Imbrenda <address@hidden>
Return the correct error code when the SCCB buffer is too small to
contain all of the output, for the Read SCP Information and
Read CPU Information commands.
Signed-off-by: Claudio Imbrenda <address@hidden>
Reviewed-by: Jason J. Herne <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>
---
hw/s390x/sclp.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
index abb6e5011f9c..f57ce7b73943 100644
--- a/hw/s390x/sclp.c
+++ b/hw/s390x/sclp.c
@@ -68,6 +68,12 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb)
read_info->ibc_val = cpu_to_be32(s390_get_ibc_val());
+ if (be16_to_cpu(sccb->h.length) <
+ (sizeof(ReadInfo) + cpu_count * sizeof(CPUEntry))) {
+ sccb->h.response_code = cpu_to_be16(SCLP_RC_INSUFFICIENT_SCCB_LENGTH);
+ return;
+ }
+
/* Configuration Characteristic (Extension) */
s390_get_feat_block(S390_FEAT_TYPE_SCLP_CONF_CHAR,
read_info->conf_char);
@@ -118,6 +124,12 @@ static void sclp_read_cpu_info(SCLPDevice *sclp, SCCB
*sccb)
cpu_info->offset_configured = cpu_to_be16(offsetof(ReadCpuInfo, entries));
cpu_info->nr_standby = cpu_to_be16(0);
+ if (be16_to_cpu(sccb->h.length) <
+ (sizeof(ReadCpuInfo) + cpu_count * sizeof(CPUEntry))) {
+ sccb->h.response_code = cpu_to_be16(SCLP_RC_INSUFFICIENT_SCCB_LENGTH);
+ return;
+ }
+
/* The standby offset is 16-byte for each CPU */
cpu_info->offset_standby = cpu_to_be16(cpu_info->offset_configured
+ cpu_info->nr_configured*sizeof(CPUEntry));
--
2.21.0
- [PULL 00/12] s390x qemu updates 20190930, Christian Borntraeger, 2019/09/30
- [PULL 07/12] configure: Remove s390 (31-bit mode) from the list of supported CPUs, Christian Borntraeger, 2019/09/30
- [PULL 05/12] s390x: sclp: fix error handling for oversize control blocks, Christian Borntraeger, 2019/09/30
- [PULL 01/12] MAINTAINERS: Update S390 PCI Maintainer, Christian Borntraeger, 2019/09/30
- [PULL 06/12] s390x: sclp: Report insufficient SCCB length,
Christian Borntraeger <=
- [PULL 04/12] s390x: sclp: boundary check, Christian Borntraeger, 2019/09/30
- [PULL 02/12] s390: PCI: fix IOMMU region init, Christian Borntraeger, 2019/09/30
- [PULL 11/12] s390: do not call memory_region_allocate_system_memory() multiple times, Christian Borntraeger, 2019/09/30
- [PULL 08/12] kvm: extract kvm_log_clear_one_slot, Christian Borntraeger, 2019/09/30
- [PULL 10/12] kvm: split too big memory section on several memslots, Christian Borntraeger, 2019/09/30
- [PULL 03/12] s390x: sclp: refactor invalid command check, Christian Borntraeger, 2019/09/30
- [PULL 12/12] s390/kvm: split kvm mem slots at 4TB, Christian Borntraeger, 2019/09/30
- [PULL 09/12] kvm: clear dirty bitmaps from all overlapping memslots, Christian Borntraeger, 2019/09/30