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 380EC1AB534; Mon, 14 Oct 2024 15:13:48 +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=1728918828; cv=none; b=J/SUZrTseAZBN1nyJg5A+wvTrvkGq4WYFTAvtDg9Vh7yMGZss1F0+WFzrhpGN8eC8F7bhi6dt19UhDswllZtnAC1uGPG4cl/p0dOoa46UeYsXqu37goRwJgogyd/ipiQCkOXQ35BMdh8BjkfSYTkExbXymtNU2m7mp2slcmFOVQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728918828; c=relaxed/simple; bh=tRsNh4DUZvzMVzcr06dCReC32L8gZaKhWf+FE+J3Mpc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=b8EncsPfw+OCCBZuBwNJJj92fyJv8d1x9Q0VJGRJv64/6uL/77KdaJaDM8/PpHJGkOyN2S+MW57n9HIjG7c810Ti+ZsZkYHiNx0MGFOn5Mgsat6HgOzdOerlHKLgNzqp0aU3B97L3Vp5NJn3nrONCt3/wDe20hmkvJaPZafTD/E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cKNzNsNR; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="cKNzNsNR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9CA68C4CEC7; Mon, 14 Oct 2024 15:13:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728918828; bh=tRsNh4DUZvzMVzcr06dCReC32L8gZaKhWf+FE+J3Mpc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cKNzNsNRBWc4UD0xXNtXPQCgZ1Rta9/3rS5H4Gl+SMRnctn2chS8WZzr9Vp2EAbmW 80QU+2J5WS7KL2G2CiuZ+hIJxOOA59LCmsgQSMD3rNoAGy1VTSCvzYpkdWDKb5dvz9 H+eism2m7pxyJgAb+kOD1aUDkesIBs4FyLCud8BA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Armin Wolf , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 6.1 427/798] ACPICA: Fix memory leak if acpi_ps_get_next_namepath() fails Date: Mon, 14 Oct 2024 16:16:21 +0200 Message-ID: <20241014141234.725458528@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241014141217.941104064@linuxfoundation.org> References: <20241014141217.941104064@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ 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 f7ec5606098c7..919a7aebcc036 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