From: Chen Yu <yu.c.chen@intel.com>
To: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Len Brown <lenb@kernel.org>,
Robert Moore <robert.moore@intel.com>
Cc: linux-acpi@vger.kernel.org,
acpica-devel@lists.linuxfoundation.org,
linux-kernel@vger.kernel.org, Chen Yu <yu.c.chen@intel.com>,
Hariganesh Govindarajulu <hariganesh.govindarajulu@intel.com>
Subject: [PATCH] ACPI: tools: pfrut: Check if the input of level and type is in the right numeric range
Date: Tue, 7 Mar 2023 19:41:45 +0800 [thread overview]
Message-ID: <20230307114145.8933-1-yu.c.chen@intel.com> (raw)
The user can provide arbitrary non-numeic value to level and type, which
brings unexpected behavior:
pfrut -h
usage: pfrut [OPTIONS]
code injection:
-l, --load
-s, --stage
-a, --activate
-u, --update [stage and activate]
-q, --query
-d, --revid
update telemetry:
-G, --getloginfo
-T, --type(0:execution, 1:history)
-L, --level(0, 1, 2, 4)
-R, --read
-D, --revid log
pfrut -T A
pfrut -G
log_level:0
log_type:0
log_revid:2
max_data_size:65536
chunk1_size:0
chunk2_size:1530
rollover_cnt:0
reset_cnt:17
Fix this by restricting the input is in the expected range.
Reported-by: Hariganesh Govindarajulu <hariganesh.govindarajulu@intel.com>
Signed-off-by: Chen Yu <yu.c.chen@intel.com>
---
tools/power/acpi/tools/pfrut/pfrut.c | 33 ++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/tools/power/acpi/tools/pfrut/pfrut.c b/tools/power/acpi/tools/pfrut/pfrut.c
index 52aa0351533c..ed672efef83b 100644
--- a/tools/power/acpi/tools/pfrut/pfrut.c
+++ b/tools/power/acpi/tools/pfrut/pfrut.c
@@ -22,6 +22,7 @@
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <uuid/uuid.h>
+#include <ctype.h>
#include PFRUT_HEADER
char *capsule_name;
@@ -77,6 +78,18 @@ static void help(void)
progname);
}
+static int is_digit_input(char *str)
+{
+ char *scan;
+
+ for (scan = str; *scan != '\0'; scan++) {
+ if (!isdigit(*scan))
+ return 0;
+ }
+
+ return 1;
+}
+
char *option_string = "l:sauqd:GT:L:RD:h";
static struct option long_options[] = {
{"load", required_argument, 0, 'l'},
@@ -125,11 +138,31 @@ static void parse_options(int argc, char **argv)
log_getinfo = 1;
break;
case 'T':
+ if (!is_digit_input(optarg)) {
+ printf("Please provide numeric value for type (0:execution, 1:history) - Exiting.\n");
+ exit(1);
+ }
+
log_type = atoi(optarg);
+ if (log_type != 0 && log_type != 1) {
+ printf("Please provide numeric value for type (0:execution, 1:history) - Exiting.\n");
+ exit(1);
+ }
+
set_log_type = 1;
break;
case 'L':
+ if (!is_digit_input(optarg)) {
+ printf("Please provide numeric value for level (0, 1, 2, 4) - Exiting.\n");
+ exit(1);
+ }
+
log_level = atoi(optarg);
+ if (log_level > 4) {
+ printf("Please provide numeric value for level (0, 1, 2, 4) - Exiting.\n");
+ exit(1);
+ }
+
set_log_level = 1;
break;
case 'R':
--
2.25.1
next reply other threads:[~2023-03-07 3:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-07 11:41 Chen Yu [this message]
2023-03-07 11:38 ` [PATCH] ACPI: tools: pfrut: Check if the input of level and type is in the right numeric range Rafael J. Wysocki
2023-03-08 4:20 ` Chen Yu
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=20230307114145.8933-1-yu.c.chen@intel.com \
--to=yu.c.chen@intel.com \
--cc=acpica-devel@lists.linuxfoundation.org \
--cc=hariganesh.govindarajulu@intel.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
--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