]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ACPICA: check null return of ACPI_ALLOCATE_ZEROED() in acpi_db_convert_to_package()
authorPei Xiao <xiaopei01@kylinos.cn>
Thu, 18 Jul 2024 06:05:48 +0000 (14:05 +0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 2 Aug 2024 14:51:07 +0000 (16:51 +0200)
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>
drivers/acpi/acpica/dbconvert.c

index 2b84ac093698a3d7e7297efb7f9d633791178d55..8dbab6932049981750be3a78e7e7c463785654af 100644 (file)
@@ -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++) {