From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7796B211CFE; Wed, 25 Sep 2024 12:12:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727266336; cv=none; b=IA58ZMxHa2TU118FJetx+WeRcAANBTa4sTVU6JGdmWBBXe1LKzjCMOb2JmPYp9HzUsuht37QE7a1Wr8cmkffwpS+APCxETQSZ+MWX0UoftTgRdOZypZerTJJbN7uUXm/VEjpRjXo7YbZwXsW70lOYmxmkS/pDAFgg7MewQta4Kc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727266336; c=relaxed/simple; bh=+vRT/9sKMUBWk8ChoX3rH60aEURssGy3Awjy1YZ6UG4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PfEpCEOdt9+XQIrNhapH7TdPfAvjED76Ssa/mmU3tyPg1IqvHNfasWRuUp4gykaM/Qz/JEhT6fFqFcKm2ow6pB81kckzNIqu9FK9ktc6Fp1+loMnzpp4W2fGb+r7Bl3idYLzbRlRYDTCPi1fAqZoQ7jNXNfgPGYLM6wbzqUuG1g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uwA1apSp; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="uwA1apSp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 51645C4CECE; Wed, 25 Sep 2024 12:12:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727266336; bh=+vRT/9sKMUBWk8ChoX3rH60aEURssGy3Awjy1YZ6UG4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uwA1apSpAioHTLZdI6c0MrhHM4KaIao+G89ndOhMxnia4bo//347J4gtDnTGXkWpm 0Gc2NTuKsjAT41m0V8f50lo+wHzA3jd7POy9NwlXPfc0bHw6GlhGF0zDgrez2loY72 CPRgg8ArmIlXceubvYNtEK75WM7nqiWNi9qqVPIkbQl/k3Vwgi83UogZpvfbtk2dIf rwjZga7iMyJoO1fMja7eVFtXZRNX6MjPUa/hJI2w/hEuvJxU+YSBGJy7YM0gLoTPVG 0o+4oKXeuGztz4V8IfJj7K54F1pibu72ixKEsCjaxoBofEhDvWMKj7sdi85gvdMmXh MksbR7ZxQd+Og== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Armin Wolf , "Rafael J . Wysocki" , Sasha Levin , robert.moore@intel.com, linux-acpi@vger.kernel.org, acpica-devel@lists.linux.dev Subject: [PATCH AUTOSEL 6.6 016/139] ACPICA: Fix memory leak if acpi_ps_get_next_namepath() fails Date: Wed, 25 Sep 2024 08:07:16 -0400 Message-ID: <20240925121137.1307574-16-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240925121137.1307574-1-sashal@kernel.org> References: <20240925121137.1307574-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.52 Content-Transfer-Encoding: 8bit From: Armin Wolf [ Upstream commit 5accb265f7a1b23e52b0ec42313d1e12895552f4 ] ACPICA commit 2802af722bbde7bf1a7ac68df68e179e2555d361 If acpi_ps_get_next_namepath() fails, the previously allocated union acpi_parse_object needs to be freed before returning the status code. The issue was first being reported on the Linux ACPI mailing list: Link: https://lore.kernel.org/linux-acpi/56f94776-484f-48c0-8855-dba8e6a7793b@yandex.ru/T/ Link: https://github.com/acpica/acpica/commit/2802af72 Signed-off-by: Armin Wolf Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/acpica/psargs.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/acpi/acpica/psargs.c b/drivers/acpi/acpica/psargs.c index 422c074ed2897..7debfd5ce0d86 100644 --- a/drivers/acpi/acpica/psargs.c +++ b/drivers/acpi/acpica/psargs.c @@ -820,6 +820,10 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state, acpi_ps_get_next_namepath(walk_state, parser_state, arg, ACPI_NOT_METHOD_CALL); + if (ACPI_FAILURE(status)) { + acpi_ps_free_op(arg); + return_ACPI_STATUS(status); + } } else { /* Single complex argument, nothing returned */ @@ -854,6 +858,10 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state, acpi_ps_get_next_namepath(walk_state, parser_state, arg, ACPI_POSSIBLE_METHOD_CALL); + if (ACPI_FAILURE(status)) { + acpi_ps_free_op(arg); + return_ACPI_STATUS(status); + } if (arg->common.aml_opcode == AML_INT_METHODCALL_OP) { -- 2.43.0