From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 644B8C7EE26 for ; Mon, 1 May 2023 03:16:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233033AbjEADQs (ORCPT ); Sun, 30 Apr 2023 23:16:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233504AbjEADPq (ORCPT ); Sun, 30 Apr 2023 23:15:46 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D17C455A2; Sun, 30 Apr 2023 20:06:20 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 51A8C6100E; Mon, 1 May 2023 03:05:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EF6E7C4339C; Mon, 1 May 2023 03:05:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682910315; bh=hRj1ydpVYptJsvNmiO59+UYPMUE4NUJHzAScAHy8VdI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dAErGKbTBNU8MdN/o/RUy0uVsEit8sk+mCilPZxUy5l5VEJDVXQairISbQL7ggGuI PZZrFC9cWx+vy+1G6ftfQsA+2BQjvgue3yIh+I0eb/mUoiplkkazI/wnSF33Y5p75L 2+FPe/3Fgk7XY0vnGfqWZC1yLSmSbbKsaQMXetaQl2A1XqxZjLDNwQlr7LpWWA7hvd irmkA52IaiuvmU337pldpZswKHMbO16XTUJWPCEmgi4FbtD6jrozFDaexiCKRb1uIW BezRVqxzKstD7JxYPZaIJEgDne0ZJ+KRhrwUEoC9ghPxD4Frm6jJiIqe6vuuvq/FUq Ju9jjDKRFXHXw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: void0red <30990023+void0red@users.noreply.github.com>, Bob Moore , "Rafael J . Wysocki" , Sasha Levin , linux-acpi@vger.kernel.org, acpica-devel@lists.linuxfoundation.org Subject: [PATCH AUTOSEL 5.15 14/17] ACPICA: ACPICA: check null return of ACPI_ALLOCATE_ZEROED in acpi_db_display_objects Date: Sun, 30 Apr 2023 23:04:31 -0400 Message-Id: <20230501030435.3254695-14-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230501030435.3254695-1-sashal@kernel.org> References: <20230501030435.3254695-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.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 3615e1a6efd8a..b91155ea9c343 100644 --- a/drivers/acpi/acpica/dbnames.c +++ b/drivers/acpi/acpica/dbnames.c @@ -652,6 +652,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