summaryrefslogtreecommitdiffstats
path: root/tools/power
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-10-11 08:45:51 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-12-17 11:29:30 -0800
commitf447ef4a56dee4b68a91460bcdfe06b5011085f2 (patch)
tree01b54396e34ee5896b677f1907a4e357efd72768 /tools/power
parent319e2e3f63c348a9b66db4667efa73178e18b17d (diff)
downloadlinux-f447ef4a56dee4b68a91460bcdfe06b5011085f2.tar.gz
linux-f447ef4a56dee4b68a91460bcdfe06b5011085f2.tar.bz2
linux-f447ef4a56dee4b68a91460bcdfe06b5011085f2.zip
cpupower: Fix segfault due to incorrect getopt_long arugments
If a user calls 'cpupower set --perf-bias 15', the process will end with a SIGSEGV in libc because cpupower-set passes a NULL optarg to the atoi call. This is because the getopt_long structure currently has all of the options as having an optional_argument when they really have a required argument. We change the structure to use required_argument to match the short options and it resolves the issue. This fixes https://bugzilla.redhat.com/show_bug.cgi?id=1000439 Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org> Cc: Dominik Brodowski <linux@dominikbrodowski.net> Cc: Thomas Renninger <trenn@suse.de> Cc: stable@vger.kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'tools/power')
-rw-r--r--tools/power/cpupower/utils/cpupower-set.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/power/cpupower/utils/cpupower-set.c b/tools/power/cpupower/utils/cpupower-set.c
index dc4de3762111..bcf1d2f0b791 100644
--- a/tools/power/cpupower/utils/cpupower-set.c
+++ b/tools/power/cpupower/utils/cpupower-set.c
@@ -18,9 +18,9 @@
#include "helpers/bitmask.h"
static struct option set_opts[] = {
- { .name = "perf-bias", .has_arg = optional_argument, .flag = NULL, .val = 'b'},
- { .name = "sched-mc", .has_arg = optional_argument, .flag = NULL, .val = 'm'},
- { .name = "sched-smt", .has_arg = optional_argument, .flag = NULL, .val = 's'},
+ { .name = "perf-bias", .has_arg = required_argument, .flag = NULL, .val = 'b'},
+ { .name = "sched-mc", .has_arg = required_argument, .flag = NULL, .val = 'm'},
+ { .name = "sched-smt", .has_arg = required_argument, .flag = NULL, .val = 's'},
{ },
};