41 lines
1.7 KiB
Diff
41 lines
1.7 KiB
Diff
|
From cb8e390d258b7f8073afafcbb163976e27346e9d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Josh Boyer <jwboyer@fedoraproject.org>
|
||
|
|
Date: Fri, 11 Oct 2013 08:37:53 -0400
|
||
|
|
Subject: [PATCH] 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
|
||
|
|
|
||
|
|
Cc: stable@vger.kernel.org
|
||
|
|
Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
|
||
|
|
---
|
||
|
|
tools/power/cpupower/utils/cpupower-set.c | 6 +++---
|
||
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tools/power/cpupower/utils/cpupower-set.c b/tools/power/cpupower/utils/cpupower-set.c
|
||
|
|
index dc4de37..bcf1d2f 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'},
|
||
|
|
{ },
|
||
|
|
};
|
||
|
|
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|