| Message ID | 20200622113146.33421-1-gengdongjiu@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ACPI: Assert that we don't run out of the preallocated memory | expand |
On Mon, 22 Jun 2020 at 12:30, Dongjiu Geng <gengdongjiu@huawei.com> wrote: > > data_length is a constant value, so we use assert instead of > condition check. > > Signed-off-by: Dongjiu Geng <gengdongjiu@huawei.com> > --- > 1. Address Peter and Michael's comments to use assert instead of if(). > https://lore.kernel.org/qemu-devel/ca79ea28-9ea9-18a5-99ad-25c3eb744721@huawei.com/ Oops, looks like we forgot about this patch -- Michael, are you taking it through your tree or should I take it via target-arm ? thanks -- PMM
On Thu, Jul 23, 2020 at 06:50:06PM +0100, Peter Maydell wrote: > On Mon, 22 Jun 2020 at 12:30, Dongjiu Geng <gengdongjiu@huawei.com> wrote: > > > > data_length is a constant value, so we use assert instead of > > condition check. > > > > Signed-off-by: Dongjiu Geng <gengdongjiu@huawei.com> > > --- > > 1. Address Peter and Michael's comments to use assert instead of if(). > > https://lore.kernel.org/qemu-devel/ca79ea28-9ea9-18a5-99ad-25c3eb744721@huawei.com/ > > Oops, looks like we forgot about this patch -- Michael, are you > taking it through your tree or should I take it via target-arm ? > > thanks > -- PMM Feel free to merge pls. Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
On Fri, 24 Jul 2020 at 13:55, Michael S. Tsirkin <mst@redhat.com> wrote: > > On Thu, Jul 23, 2020 at 06:50:06PM +0100, Peter Maydell wrote: > > On Mon, 22 Jun 2020 at 12:30, Dongjiu Geng <gengdongjiu@huawei.com> wrote: > > > > > > data_length is a constant value, so we use assert instead of > > > condition check. > > > > > > Signed-off-by: Dongjiu Geng <gengdongjiu@huawei.com> > > > --- > > > 1. Address Peter and Michael's comments to use assert instead of if(). > > > https://lore.kernel.org/qemu-devel/ca79ea28-9ea9-18a5-99ad-25c3eb744721@huawei.com/ > > > > Oops, looks like we forgot about this patch -- Michael, are you > > taking it through your tree or should I take it via target-arm ? > > > > thanks > > -- PMM > > Feel free to merge pls. > Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Applied to target-arm.next, thanks. -- PMM
diff --git a/hw/acpi/ghes.c b/hw/acpi/ghes.c index b363bc331d..f0ee9f51ca 100644 --- a/hw/acpi/ghes.c +++ b/hw/acpi/ghes.c @@ -204,16 +204,12 @@ static int acpi_ghes_record_mem_error(uint64_t error_block_address, /* This is the length if adding a new generic error data entry*/ data_length = ACPI_GHES_DATA_LENGTH + ACPI_GHES_MEM_CPER_LENGTH; - /* - * Check whether it will run out of the preallocated memory if adding a new - * generic error data entry + * It should not run out of the preallocated memory if adding a new generic + * error data entry */ - if ((data_length + ACPI_GHES_GESB_SIZE) > ACPI_GHES_MAX_RAW_DATA_LENGTH) { - error_report("Not enough memory to record new CPER!!!"); - g_array_free(block, true); - return -1; - } + assert((data_length + ACPI_GHES_GESB_SIZE) <= + ACPI_GHES_MAX_RAW_DATA_LENGTH); /* Build the new generic error status block header */ acpi_ghes_generic_error_status(block, ACPI_GEBS_UNCORRECTABLE,
data_length is a constant value, so we use assert instead of condition check. Signed-off-by: Dongjiu Geng <gengdongjiu@huawei.com> --- 1. Address Peter and Michael's comments to use assert instead of if(). https://lore.kernel.org/qemu-devel/ca79ea28-9ea9-18a5-99ad-25c3eb744721@huawei.com/ --- hw/acpi/ghes.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)