From: Aleksandr Mishin Date: Tue, 27 Aug 2024 10:12:39 +0000 (+0300) Subject: acpi/arm64: Adjust error handling procedure in gtdt_parse_timer_block() X-Git-Tag: v6.13-rc1~203^2~2^6~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1a9de2f6fda69d5f105dd8af776856a66abdaa64;p=thirdparty%2Fkernel%2Flinux.git acpi/arm64: Adjust error handling procedure in gtdt_parse_timer_block() In case of error in gtdt_parse_timer_block() invalid 'gtdt_frame' will be used in 'do {} while (i-- >= 0 && gtdt_frame--);' statement block because do{} block will be executed even if 'i == 0'. Adjust error handling procedure by replacing 'i-- >= 0' with 'i-- > 0'. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: a712c3ed9b8a ("acpi/arm64: Add memory-mapped timer support in GTDT driver") Signed-off-by: Aleksandr Mishin Acked-by: Hanjun Guo Acked-by: Sudeep Holla Acked-by: Aleksandr Mishin Link: https://lore.kernel.org/r/20240827101239.22020-1-amishin@t-argos.ru Signed-off-by: Catalin Marinas --- diff --git a/drivers/acpi/arm64/gtdt.c b/drivers/acpi/arm64/gtdt.c index d7c4e1b9915b4..81dc0582743df 100644 --- a/drivers/acpi/arm64/gtdt.c +++ b/drivers/acpi/arm64/gtdt.c @@ -294,7 +294,7 @@ error: if (frame->virt_irq > 0) acpi_unregister_gsi(gtdt_frame->virtual_timer_interrupt); frame->virt_irq = 0; - } while (i-- >= 0 && gtdt_frame--); + } while (i-- > 0 && gtdt_frame--); return -EINVAL; }