aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorPei Xiao <xiaopei01@kylinos.cn>2024-07-18 14:05:48 +0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2024-08-02 16:51:07 +0200
commita5242874488eba2b9062985bf13743c029821330 (patch)
tree6d96a802eed4bb6feae2cfd6d19d8f0b9c1528e3
parentLinux 6.11-rc1 (diff)
downloadwireguard-linux-a5242874488eba2b9062985bf13743c029821330.tar.xz
wireguard-linux-a5242874488eba2b9062985bf13743c029821330.zip
ACPICA: check null return of ACPI_ALLOCATE_ZEROED() in acpi_db_convert_to_package()
ACPICA commit 4d4547cf13cca820ff7e0f859ba83e1a610b9fd0 ACPI_ALLOCATE_ZEROED() may fail, elements might be NULL and will cause NULL pointer dereference later. Link: https://github.com/acpica/acpica/commit/4d4547cf Signed-off-by: Pei Xiao <xiaopei01@kylinos.cn> Link: https://patch.msgid.link/tencent_4A21A2865B8B0A0D12CAEBEB84708EDDB505@qq.com [ rjw: Subject and changelog edits ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/acpi/acpica/dbconvert.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/dbconvert.c b/drivers/acpi/acpica/dbconvert.c
index 2b84ac093698..8dbab6932049 100644
--- a/drivers/acpi/acpica/dbconvert.c
+++ b/drivers/acpi/acpica/dbconvert.c
@@ -174,6 +174,8 @@ acpi_status acpi_db_convert_to_package(char *string, union acpi_object *object)
elements =
ACPI_ALLOCATE_ZEROED(DB_DEFAULT_PKG_ELEMENTS *
sizeof(union acpi_object));
+ if (!elements)
+ return (AE_NO_MEMORY);
this = string;
for (i = 0; i < (DB_DEFAULT_PKG_ELEMENTS - 1); i++) {