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 E3E903242C8; Wed, 3 Dec 2025 16:24:18 +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=1764779059; cv=none; b=N9CURzZlqHyLUz+vtyYK0Y7lAEgJLqUYESDTqobRgbSgvpNr7u55uB7WQtu8tbZjr98yzz+1s1H/ZuSx0sZXPUTA4KUL5epFwHHcikbC2G9O1Ul4GAQ4Z3Lqp6cURAUBY92jOGJCRwLl8bjCfu7dh3Tisa3gvOwHxfhgkmDgE1w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764779059; c=relaxed/simple; bh=JebPXOhrzH34Trvd2RwS8Mu158khiSzYXvPqER8n5m0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bNXXaukqqiUv58A/9Jel3Apja9aBkcxGGB1Vd6QvO+Sj/SLVgerKQ7SdP1CbkiO6r7O4sD7bM78EfXbNW/vo0fMODjK3BBdz1mjfw5N0aQR3tINhkkiQ0QNyk8vO7o8PjzX5uB008/YhZobA7MsSCg0lzj3rSb+UbHNnc4+quIs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=tgBqF3wp; 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="tgBqF3wp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EBD3FC4CEF5; Wed, 3 Dec 2025 16:24:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1764779058; bh=JebPXOhrzH34Trvd2RwS8Mu158khiSzYXvPqER8n5m0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tgBqF3wpCUnb5O4efRsfsHDULgteIvvOVF2PiL1Ngg32AgS2uobSei82xFmhGsmIl j2cAPRowaqIr1I5vPPREQLubRGhLdCSo19gIjc/o/Uytn2y3r3VEkTj686yB5cWgm2 Ubgn6hEru+YlqFbVelsF3uF09Xj+x5GGbT811mjY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Hans de Goede , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 6.1 109/568] ACPICA: dispatcher: Use acpi_ds_clear_operands() in acpi_ds_call_control_method() Date: Wed, 3 Dec 2025 16:21:51 +0100 Message-ID: <20251203152444.727956552@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251203152440.645416925@linuxfoundation.org> References: <20251203152440.645416925@linuxfoundation.org> User-Agent: quilt/0.69 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: Hans de Goede [ Upstream commit e9dff11a7a50fcef23fe3e8314fafae6d5641826 ] When deleting the previous walkstate operand stack acpi_ds_call_control_method() was deleting obj_desc->Method.param_count operands. But Method.param_count does not necessarily match this_walk_state->num_operands, it may be either less or more. After correcting the for loop to check `i < this_walk_state->num_operands` the code is identical to acpi_ds_clear_operands(), so just outright replace the code with acpi_ds_clear_operands() to fix this. Link: https://github.com/acpica/acpica/commit/53fc0220 Signed-off-by: Hans de Goede Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/acpica/dsmethod.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c index 05fd1ec8de14e..c5ad377558645 100644 --- a/drivers/acpi/acpica/dsmethod.c +++ b/drivers/acpi/acpica/dsmethod.c @@ -546,14 +546,7 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread, * Delete the operands on the previous walkstate operand stack * (they were copied to new objects) */ - for (i = 0; i < obj_desc->method.param_count; i++) { - acpi_ut_remove_reference(this_walk_state->operands[i]); - this_walk_state->operands[i] = NULL; - } - - /* Clear the operand stack */ - - this_walk_state->num_operands = 0; + acpi_ds_clear_operands(this_walk_state); ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "**** Begin nested execution of [%4.4s] **** WalkState=%p\n", -- 2.51.0