From: "Rafael J. Wysocki" <rafael@kernel.org>
To: Linux ACPI <linux-acpi@vger.kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
"Dumbre, Saket" <saket.dumbre@intel.com>
Subject: [PATCH v1 11/16] ACPICA: Print error messages for too few or too many arguments
Date: Fri, 12 Sep 2025 22:01:52 +0200 [thread overview]
Message-ID: <2255091.Icojqenx9y@rafael.j.wysocki> (raw)
In-Reply-To: <2021361.PYKUYFuaPT@rafael.j.wysocki>
From: Saket Dumbre <saket.dumbre@intel.com>
Fix Issue #1027 by displaying error messages when there are too few or
too many arguments in the caller vs the definition of an ASL/AML method.
Link: https://github.com/acpica/acpica/commit/cbc243e4
Reported-by: Peter Williams <peter@newton.cx>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: Hans de Goede <hansg@kernel.org>
Signed-off-by: Saket Dumbre <saket.dumbre@intel.com>
---
drivers/acpi/acpica/dsmethod.c | 11 +++++++++--
include/acpi/acexcep.h | 10 ++++++++--
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c
index b2f756b7078d..45ec32e81903 100644
--- a/drivers/acpi/acpica/dsmethod.c
+++ b/drivers/acpi/acpica/dsmethod.c
@@ -483,10 +483,17 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
}
if (this_walk_state->num_operands < obj_desc->method.param_count) {
- ACPI_ERROR((AE_INFO, "Missing argument for method [%4.4s]",
+ ACPI_ERROR((AE_INFO, "Missing argument(s) for method [%4.4s]",
acpi_ut_get_node_name(method_node)));
- return_ACPI_STATUS(AE_AML_UNINITIALIZED_ARG);
+ return_ACPI_STATUS(AE_AML_TOO_FEW_ARGUMENTS);
+ }
+
+ else if (this_walk_state->num_operands > obj_desc->method.param_count) {
+ ACPI_ERROR((AE_INFO, "Too many arguments for method [%4.4s]",
+ acpi_ut_get_node_name(method_node)));
+
+ return_ACPI_STATUS(AE_AML_TOO_MANY_ARGUMENTS);
}
/* Init for new method, possibly wait on method mutex */
diff --git a/include/acpi/acexcep.h b/include/acpi/acexcep.h
index 53c98f5fe3c3..a2db36d18419 100644
--- a/include/acpi/acexcep.h
+++ b/include/acpi/acexcep.h
@@ -173,8 +173,10 @@ struct acpi_exception_info {
#define AE_AML_TARGET_TYPE EXCEP_AML (0x0023)
#define AE_AML_PROTOCOL EXCEP_AML (0x0024)
#define AE_AML_BUFFER_LENGTH EXCEP_AML (0x0025)
+#define AE_AML_TOO_FEW_ARGUMENTS EXCEP_AML (0x0026)
+#define AE_AML_TOO_MANY_ARGUMENTS EXCEP_AML (0x0027)
-#define AE_CODE_AML_MAX 0x0025
+#define AE_CODE_AML_MAX 0x0027
/*
* Internal exceptions used for control
@@ -353,7 +355,11 @@ static const struct acpi_exception_info acpi_gbl_exception_names_aml[] = {
"A target operand of an incorrect type was encountered"),
EXCEP_TXT("AE_AML_PROTOCOL", "Violation of a fixed ACPI protocol"),
EXCEP_TXT("AE_AML_BUFFER_LENGTH",
- "The length of the buffer is invalid/incorrect")
+ "The length of the buffer is invalid/incorrect"),
+ EXCEP_TXT("AE_AML_TOO_FEW_ARGUMENTS",
+ "There are fewer than expected method arguments"),
+ EXCEP_TXT("AE_AML_TOO_MANY_ARGUMENTS",
+ "There are too many arguments for this method")
};
static const struct acpi_exception_info acpi_gbl_exception_names_ctrl[] = {
--
2.51.0
next prev parent reply other threads:[~2025-09-12 20:06 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-12 19:51 [PATCH v1 00/16] ACPICA: ACPICA 20250807 Rafael J. Wysocki
2025-09-12 19:52 ` [PATCH v1 01/16] ACPICA: Modify variable definition position Rafael J. Wysocki
2025-09-12 19:53 ` [PATCH v1 02/16] ACPICA: Remove redundant "#ifdef" definitions Rafael J. Wysocki
2025-09-12 19:54 ` [PATCH v1 03/16] ACPICA: Change the compilation conditions Rafael J. Wysocki
2025-09-12 19:54 ` [PATCH v1 04/16] ACPICA: Allow to skip Global Lock initialization Rafael J. Wysocki
2025-09-12 19:55 ` [PATCH v1 05/16] ACPICA: Apply ACPI_NONSTRING Rafael J. Wysocki
2025-09-12 19:56 ` [PATCH v1 06/16] ACPICA: iASL: Fix printing CDAT table header Rafael J. Wysocki
2025-09-12 19:58 ` [PATCH v1 07/16] ACPICA: acpidump: drop ACPI_NONSTRING attribute from file_name Rafael J. Wysocki
2025-09-12 19:59 ` [PATCH v1 08/16] ACPICA: Debugger: drop ACPI_NONSTRING attribute from name_seg Rafael J. Wysocki
2025-09-12 20:00 ` [PATCH v1 09/16] ACPICA: dispatcher: Use acpi_ds_clear_operands() in acpi_ds_call_control_method() Rafael J. Wysocki
2025-09-12 20:01 ` [PATCH v1 10/16] ACPICA: Update dsmethod.c to get rid of unused variable warning Rafael J. Wysocki
2025-09-12 20:01 ` Rafael J. Wysocki [this message]
2025-09-12 20:02 ` [PATCH v1 12/16] ACPICA: Update version to 20250807 Rafael J. Wysocki
2025-09-12 20:03 ` [PATCH v1 13/16] ACPICA: Fix largest possible resource descriptor index Rafael J. Wysocki
2025-09-12 20:04 ` [PATCH v1 14/16] ACPICA: CEDT: Add Back-Invalidate restriction to CXL Window Rafael J. Wysocki
2025-09-12 20:05 ` [PATCH v1 15/16] ACPICA: ACPI_TYPE_ANY does not include the package type Rafael J. Wysocki
2025-09-12 20:06 ` [PATCH v1 16/16] ACPICA: acpidump: fix return values in ap_is_valid_checksum() Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2255091.Icojqenx9y@rafael.j.wysocki \
--to=rafael@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=saket.dumbre@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®