From: Erik Kaneda <erik.kaneda@intel.com>
To: "Rafael J . Wysocki" <rafael@kernel.org>,
ACPI Devel Maling List <linux-acpi@vger.kernel.org>
Cc: Bob Moore <robert.moore@intel.com>, Erik Kaneda <erik.kaneda@intel.com>
Subject: [PATCH 6/9] ACPICA: iASL: Return exceptions for string-to-integer conversions
Date: Wed, 7 Oct 2020 19:54:00 -0700 [thread overview]
Message-ID: <20201008025403.2401736-7-erik.kaneda@intel.com> (raw)
In-Reply-To: <20201008025403.2401736-1-erik.kaneda@intel.com>
From: Bob Moore <robert.moore@intel.com>
This allows iASL to generate errors by passing exceptions that may be
encountered during string-to-integer conversions. The exceptions
point out invalid hex, decimal, and octal integers.
ACPICA commit e98b8c0a3d96fdabb167c0ef18a809b32ade3228
Link: https://github.com/acpica/acpica/commit/e98b8c0a
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Kaneda <erik.kaneda@intel.com>
---
drivers/acpi/acpica/utstrsuppt.c | 33 +++++++++++++++++++++++---------
include/acpi/acexcep.h | 4 ++--
2 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/drivers/acpi/acpica/utstrsuppt.c b/drivers/acpi/acpica/utstrsuppt.c
index 05ff20049b87..2d91003fcf26 100644
--- a/drivers/acpi/acpica/utstrsuppt.c
+++ b/drivers/acpi/acpica/utstrsuppt.c
@@ -45,10 +45,15 @@ acpi_status acpi_ut_convert_octal_string(char *string, u64 *return_value_ptr)
/* Convert each ASCII byte in the input string */
while (*string) {
-
- /* Character must be ASCII 0-7, otherwise terminate with no error */
-
+ /*
+ * Character must be ASCII 0-7, otherwise:
+ * 1) Runtime: terminate with no error, per the ACPI spec
+ * 2) Compiler: return an error
+ */
if (!(ACPI_IS_OCTAL_DIGIT(*string))) {
+#ifdef ACPI_ASL_COMPILER
+ status = AE_BAD_OCTAL_CONSTANT;
+#endif
break;
}
@@ -94,10 +99,15 @@ acpi_status acpi_ut_convert_decimal_string(char *string, u64 *return_value_ptr)
/* Convert each ASCII byte in the input string */
while (*string) {
-
- /* Character must be ASCII 0-9, otherwise terminate with no error */
-
+ /*
+ * Character must be ASCII 0-9, otherwise:
+ * 1) Runtime: terminate with no error, per the ACPI spec
+ * 2) Compiler: return an error
+ */
if (!isdigit(*string)) {
+#ifdef ACPI_ASL_COMPILER
+ status = AE_BAD_DECIMAL_CONSTANT;
+#endif
break;
}
@@ -143,10 +153,15 @@ acpi_status acpi_ut_convert_hex_string(char *string, u64 *return_value_ptr)
/* Convert each ASCII byte in the input string */
while (*string) {
-
- /* Must be ASCII A-F, a-f, or 0-9, otherwise terminate with no error */
-
+ /*
+ * Character must be ASCII A-F, a-f, or 0-9, otherwise:
+ * 1) Runtime: terminate with no error, per the ACPI spec
+ * 2) Compiler: return an error
+ */
if (!isxdigit(*string)) {
+#ifdef ACPI_ASL_COMPILER
+ status = AE_BAD_HEX_CONSTANT;
+#endif
break;
}
diff --git a/include/acpi/acexcep.h b/include/acpi/acexcep.h
index 436cd1411c3a..2fc624a61769 100644
--- a/include/acpi/acexcep.h
+++ b/include/acpi/acexcep.h
@@ -40,12 +40,12 @@
struct acpi_exception_info {
char *name;
-#ifdef ACPI_HELP_APP
+#if defined (ACPI_HELP_APP) || defined (ACPI_ASL_COMPILER)
char *description;
#endif
};
-#ifdef ACPI_HELP_APP
+#if defined (ACPI_HELP_APP) || defined (ACPI_ASL_COMPILER)
#define EXCEP_TXT(name,description) {name, description}
#else
#define EXCEP_TXT(name,description) {name}
--
2.25.1
next prev parent reply other threads:[~2020-10-08 3:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-08 2:53 [PATCH 0/9] ACPICA release 20200925 Erik Kaneda
2020-10-08 2:53 ` [PATCH 1/9] ACPICA: Add support for 64 bit risc-v compilation Erik Kaneda
2020-10-08 2:53 ` [PATCH 2/9] ACPICA: Drop the repeated word "an" in a comment Erik Kaneda
2020-10-08 2:53 ` [PATCH 3/9] ACPICA: Tree-wide: fix various typos and spelling mistakes Erik Kaneda
2020-10-08 2:53 ` [PATCH 4/9] ACPICA: Add predefined names found in the SMBus sepcification Erik Kaneda
2020-10-08 2:53 ` [PATCH 5/9] ACPICA: acpi_help: Update UUID list Erik Kaneda
2020-10-08 2:54 ` Erik Kaneda [this message]
2020-10-08 2:54 ` [PATCH 7/9] ACPICA: Debugger: Add a new command: "ALL <NameSeg>" Erik Kaneda
2020-10-08 2:54 ` [PATCH 8/9] ACPICA: Remove unnecessary semicolon Erik Kaneda
2020-10-08 2:54 ` [PATCH 9/9] ACPICA: Update version to 20200925 Version 20200925 Erik Kaneda
2020-10-08 16:06 ` [PATCH 0/9] ACPICA release 20200925 Rafael J. Wysocki
2020-10-08 17:40 ` Kaneda, Erik
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=20201008025403.2401736-7-erik.kaneda@intel.com \
--to=erik.kaneda@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=robert.moore@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;
as well as URLs for NNTP newsgroup(s).