ACPICA: nsrepair: handle cases without a return value correctly
authorDaniil Tatianin <d-tatianin@yandex-team.ru>
Fri, 6 Jan 2023 23:53:08 +0000 (02:53 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Mar 2023 08:32:52 +0000 (09:32 +0100)
commit550802b8ed58d6f69058823a83a6139132d1a4e6
tree48b19b9cd51463ce3fb4b4c8daf91d8ef580e638
parent8ffe7de184cb2e61c169f21c1ef85360683dde65
ACPICA: nsrepair: handle cases without a return value correctly

[ Upstream commit ca843a4c79486e99a19b859ef0b9887854afe146 ]

Previously acpi_ns_simple_repair() would crash if expected_btypes
contained any combination of ACPI_RTYPE_NONE with a different type,
e.g | ACPI_RTYPE_INTEGER because of slightly incorrect logic in the
!return_object branch, which wouldn't return AE_AML_NO_RETURN_VALUE
for such cases.

Found by Linux Verification Center (linuxtesting.org) with the SVACE
static analysis tool.

Link: https://github.com/acpica/acpica/pull/811
Fixes: 61db45ca2163 ("ACPICA: Restore code that repairs NULL package elements in return values.")
Signed-off-by: Daniil Tatianin <d-tatianin@yandex-team.ru>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/acpi/acpica/nsrepair.c