diff options
author | Zephaniah E. Loss-Cutler-Hull <zephaniah@gmail.com> | 2019-02-09 05:25:48 -0800 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2019-08-31 14:48:34 -0400 |
commit | 03531482402a2bc4ab93cf6dde46833775e035e9 (patch) | |
tree | f148a5b69b0a5bb2d27fc6f05a0e92cd04843e83 | |
parent | f3fe116a44fd02bc65dd312969697d06ca86b730 (diff) | |
download | linux-stable-03531482402a2bc4ab93cf6dde46833775e035e9.tar.gz linux-stable-03531482402a2bc4ab93cf6dde46833775e035e9.tar.bz2 linux-stable-03531482402a2bc4ab93cf6dde46833775e035e9.zip |
tools/power x86_energy_perf_policy: Fix argument parsing
The -w argument in x86_energy_perf_policy currently triggers an
unconditional segfault.
This is because the argument string reads: "+a:c:dD:E:e:f:m:M:rt:u:vw" and
yet the argument handler expects an argument.
When parse_optarg_string is called with a null argument, we then proceed to
crash in strncmp, not horribly friendly.
The man page describes -w as taking an argument, the long form
(--hwp-window) is correctly marked as taking a required argument, and the
code expects it.
As such, this patch simply marks the short form (-w) as requiring an
argument.
Signed-off-by: Zephaniah E. Loss-Cutler-Hull <zephaniah@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r-- | tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c b/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c index 7663abef51e9..3fe1eed900d4 100644 --- a/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c +++ b/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c @@ -545,7 +545,7 @@ void cmdline(int argc, char **argv) progname = argv[0]; - while ((opt = getopt_long_only(argc, argv, "+a:c:dD:E:e:f:m:M:rt:u:vw", + while ((opt = getopt_long_only(argc, argv, "+a:c:dD:E:e:f:m:M:rt:u:vw:", long_options, &option_index)) != -1) { switch (opt) { case 'a': |