Commit 4b017e59 authored by Ard Biesheuvel's avatar Ard Biesheuvel

efi: ssdt: Don't free memory if ACPI table was loaded successfully

Amadeusz reports KASAN use-after-free errors introduced by commit
3881ee0b ("efi: avoid efivars layer when loading SSDTs from
variables"). The problem appears to be that the memory that holds the
new ACPI table is now freed unconditionally, instead of only when the
ACPI core reported a failure to load the table.

So let's fix this, by omitting the kfree() on success.

Cc: <stable@vger.kernel.org> # v6.0
Link: https://lore.kernel.org/all/a101a10a-4fbb-5fae-2e3c-76cf96ed8fbd@linux.intel.com/
Fixes: 3881ee0b ("efi: avoid efivars layer when loading SSDTs from variables")
Reported-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent f57fb375
...@@ -271,6 +271,8 @@ static __init int efivar_ssdt_load(void) ...@@ -271,6 +271,8 @@ static __init int efivar_ssdt_load(void)
acpi_status ret = acpi_load_table(data, NULL); acpi_status ret = acpi_load_table(data, NULL);
if (ret) if (ret)
pr_err("failed to load table: %u\n", ret); pr_err("failed to load table: %u\n", ret);
else
continue;
} else { } else {
pr_err("failed to get var data: 0x%lx\n", status); pr_err("failed to get var data: 0x%lx\n", status);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment