[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/10] acpi/erst: fix fallthrough code upon validation failure
From: |
Michael S. Tsirkin |
Subject: |
[PULL 10/10] acpi/erst: fix fallthrough code upon validation failure |
Date: |
Thu, 16 Jun 2022 12:57:51 -0400 |
From: Ani Sinha <ani@anisinha.ca>
At any step when any validation fail in check_erst_backend_storage(), there is
no need to continue further through other validation checks. Further, by
continuing even when record_size is 0, we run the risk of triggering a divide
by zero error if we continued with other validation checks. Hence, we should
simply return from this function upon validation failure.
CC: Peter Maydell <peter.maydell@linaro.org>
CC: Eric DeVolder <eric.devolder@oracle.com>
Signed-off-by: Ani Sinha <ani@anisinha.ca>
Message-Id: <20220513141005.1929422-1-ani@anisinha.ca>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eric DeVolder <eric.devolder@oracle.com>
---
hw/acpi/erst.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/hw/acpi/erst.c b/hw/acpi/erst.c
index de509c2b48..df856b2669 100644
--- a/hw/acpi/erst.c
+++ b/hw/acpi/erst.c
@@ -440,6 +440,7 @@ static void check_erst_backend_storage(ERSTDeviceState *s,
Error **errp)
(record_size >= 4096) /* PAGE_SIZE */
)) {
error_setg(errp, "ERST record_size %u is invalid", record_size);
+ return;
}
/* Validity check header */
@@ -450,6 +451,7 @@ static void check_erst_backend_storage(ERSTDeviceState *s,
Error **errp)
(le16_to_cpu(header->reserved) == 0)
)) {
error_setg(errp, "ERST backend storage header is invalid");
+ return;
}
/* Check storage_size against record_size */
@@ -457,6 +459,7 @@ static void check_erst_backend_storage(ERSTDeviceState *s,
Error **errp)
(record_size > s->storage_size)) {
error_setg(errp, "ACPI ERST requires storage size be multiple of "
"record size (%uKiB)", record_size);
+ return;
}
/* Compute offset of first and last record storage slot */
--
MST
- [PULL 00/10] virtio,pc,pci: fixes,cleanups,features, Michael S. Tsirkin, 2022/06/16
- [PULL 01/10] pci-bridge/cxl_upstream: Add a CXL switch upstream port, Michael S. Tsirkin, 2022/06/16
- [PULL 02/10] pci-bridge/cxl_downstream: Add a CXL switch downstream port, Michael S. Tsirkin, 2022/06/16
- [PULL 03/10] docs/cxl: Add switch documentation, Michael S. Tsirkin, 2022/06/16
- [PULL 04/10] virtio/vhost-user: Fix wrong vhost notifier GPtrArray size, Michael S. Tsirkin, 2022/06/16
- [PULL 06/10] virtio-iommu: Use recursive lock to avoid deadlock, Michael S. Tsirkin, 2022/06/16
- [PULL 05/10] virtio-iommu: Add bypass mode support to assigned device, Michael S. Tsirkin, 2022/06/16
- [PULL 07/10] virtio-iommu: Add an assert check in translate routine, Michael S. Tsirkin, 2022/06/16
- [PULL 10/10] acpi/erst: fix fallthrough code upon validation failure,
Michael S. Tsirkin <=
- [PULL 09/10] vhost: also check queue state in the vhost_dev_set_log error routine, Michael S. Tsirkin, 2022/06/16
- [PULL 08/10] crypto: Introduce RSA algorithm, Michael S. Tsirkin, 2022/06/16
- Re: [PULL 00/10] virtio,pc,pci: fixes,cleanups,features, Richard Henderson, 2022/06/16