Return-Path: DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 067874060E DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 5237F40134 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682910387; bh=UwcGdfQjNMwir3O9UvciyN8LJVzVBjG81GjziT3yCPM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vAhqSWKPpll5lAqDItLjXqTROHgVDVEQoZloNFN8taY6fQwRvA7h3//BaxkK/Z83p 1O0PPzKPlVXAiNYJvGWGGWfKi5829d+a7fOS3PUyJyotb2EOgyO9w1vKy24EcqKjJt BxFQ31Let+cT7lYhAsbcxxF+bQrdOt2TM2ChnJj9Rv8h26awQRtkF1V8VDciBiacRN IrIdtuxUgAgBjUw/y5ES8xUW6c8WODts31wVXUX17ItRf/FcFrl5ZfmgBRPcN5O7U2 m0f0wwt51inCEPm+J5yt+jveC+OVDthU28TNVzBj+g/fy/nYhQMY4a1+egcI2RYrt8 bNNnys5kIvM1Q== From: Sasha Levin Message-Id: <20230501030611.3255082-8-sashal@kernel.org> In-Reply-To: <20230501030611.3255082-1-sashal@kernel.org> References: <20230501030611.3255082-1-sashal@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Acpica-devel] [PATCH AUTOSEL 5.4 8/9] ACPICA: ACPICA: check null return of ACPI_ALLOCATE_ZEROED in acpi_db_display_objects List-Id: "This is the central place for ACPICA developer discussions and issues." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Mon, 01 May 2023 03:06:29 -0000 To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , "Rafael J . Wysocki" , void0red <30990023+void0red@users.noreply.github.com>, Bob Moore , linux-acpi@vger.kernel.org, acpica-devel@lists.linuxfoundation.org From: void0red <30990023+void0red@users.noreply.github.com> [ Upstream commit ae5a0eccc85fc960834dd66e3befc2728284b86c ] ACPICA commit 0d5f467d6a0ba852ea3aad68663cbcbd43300fd4 ACPI_ALLOCATE_ZEROED may fails, object_info might be null and will cause null pointer dereference later. Link: https://github.com/acpica/acpica/commit/0d5f467d Signed-off-by: Bob Moore Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/acpica/dbnames.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/acpi/acpica/dbnames.c b/drivers/acpi/acpica/dbnames.c index 63fe30e868075..7f14403165dd1 100644 --- a/drivers/acpi/acpica/dbnames.c +++ b/drivers/acpi/acpica/dbnames.c @@ -571,6 +571,9 @@ acpi_status acpi_db_display_objects(char *obj_type_arg, char *display_count_arg) object_info = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_object_info)); + if (!object_info) + return (AE_NO_MEMORY); + /* Walk the namespace from the root */ (void)acpi_walk_namespace(ACPI_TYPE_ANY, ACPI_ROOT_OBJECT, -- 2.39.2