diff mbox series

cpuidle_set accepts alpha numeric values for idle-set operation

Message ID 20210105122452.8687-1-latha@linux.vnet.ibm.com (mailing list archive)
State Changes Requested
Headers show
Series cpuidle_set accepts alpha numeric values for idle-set operation | expand

Commit Message

Brahadambal Srinivasan Jan. 5, 2021, 12:24 p.m. UTC
For both the d and e options in cpuidle_set, an atoi() conversion is
done without checking if the input argument is all numeric. So, an
atoi conversion is done on any character provided as input and the
CPU idle_set operation continues with that integer value, which may
not be what is intended or entirely correct.

A similar check is present for cpufreq-set already.

This patch adds a check to see that the idle_set value is all numeric
before doing a string-to-int conversion.

Signed-off-by: Brahadambal Srinivasan <latha@linux.vnet.ibm.com>
---
 tools/power/cpupower/utils/cpuidle-set.c | 39 +++++++++++++++++++++---
 1 file changed, 34 insertions(+), 5 deletions(-)

Comments

Shuah Khan Jan. 5, 2021, 6:03 p.m. UTC | #1
On 1/5/21 5:24 AM, Brahadambal Srinivasan wrote:
> For both the d and e options in cpuidle_set, an atoi() conversion is
> done without checking if the input argument is all numeric. So, an
> atoi conversion is done on any character provided as input and the
> CPU idle_set operation continues with that integer value, which may
> not be what is intended or entirely correct.
> 
> A similar check is present for cpufreq-set already.
> 
> This patch adds a check to see that the idle_set value is all numeric
> before doing a string-to-int conversion.
> 
> Signed-off-by: Brahadambal Srinivasan <latha@linux.vnet.ibm.com>
> ---
>   tools/power/cpupower/utils/cpuidle-set.c | 39 +++++++++++++++++++++---
>   1 file changed, 34 insertions(+), 5 deletions(-)
> 
> diff --git a/tools/power/cpupower/utils/cpuidle-set.c b/tools/power/cpupower/utils/cpuidle-set.c
> index 46158928f9ad..b3dec48e7141 100644
> --- a/tools/power/cpupower/utils/cpuidle-set.c
> +++ b/tools/power/cpupower/utils/cpuidle-set.c
> @@ -21,6 +21,19 @@ static struct option info_opts[] = {
>        { },
>   };
>   
> +int is_number(char *arg)
> +{
> +	size_t len, i = 0;
> +
> +	len = strlen(arg);
> +
> +	for (i = 0; i < len; i++) {
> +		if (!isdigit(arg[i]))
> +			return 0;
> +	}
> +
> +	return 1;
> +}
>   

Any reason why you can't use isdigit()? Please see isdigit()
usages examples in other tools and cpupower itself.

thanks,
-- Shuah

thanks,
-- Shuah
Shuah Khan Jan. 5, 2021, 6:13 p.m. UTC | #2
On 1/5/21 11:03 AM, Shuah Khan wrote:
> On 1/5/21 5:24 AM, Brahadambal Srinivasan wrote:
>> For both the d and e options in cpuidle_set, an atoi() conversion is
>> done without checking if the input argument is all numeric. So, an
>> atoi conversion is done on any character provided as input and the
>> CPU idle_set operation continues with that integer value, which may
>> not be what is intended or entirely correct.
>>
>> A similar check is present for cpufreq-set already.
>>
>> This patch adds a check to see that the idle_set value is all numeric
>> before doing a string-to-int conversion.
>>
>> Signed-off-by: Brahadambal Srinivasan <latha@linux.vnet.ibm.com>
>> ---
>>   tools/power/cpupower/utils/cpuidle-set.c | 39 +++++++++++++++++++++---
>>   1 file changed, 34 insertions(+), 5 deletions(-)
>>
>> diff --git a/tools/power/cpupower/utils/cpuidle-set.c 
>> b/tools/power/cpupower/utils/cpuidle-set.c
>> index 46158928f9ad..b3dec48e7141 100644
>> --- a/tools/power/cpupower/utils/cpuidle-set.c
>> +++ b/tools/power/cpupower/utils/cpuidle-set.c
>> @@ -21,6 +21,19 @@ static struct option info_opts[] = {
>>        { },
>>   };
>> +int is_number(char *arg)
>> +{
>> +    size_t len, i = 0;
>> +
>> +    len = strlen(arg);
>> +
>> +    for (i = 0; i < len; i++) {
>> +        if (!isdigit(arg[i]))
>> +            return 0;
>> +    }
>> +
>> +    return 1;
>> +}
> 
> Any reason why you can't use isdigit()? Please see isdigit()
> usages examples in other tools and cpupower itself.
> 

Another thing. Please add "cpupower:" to identify what you are
changing clearly.

thanks,
-- Shuah
Shuah Khan Jan. 5, 2021, 7:51 p.m. UTC | #3
On 1/5/21 11:03 AM, Shuah Khan wrote:
> On 1/5/21 5:24 AM, Brahadambal Srinivasan wrote:
>> For both the d and e options in cpuidle_set, an atoi() conversion is
>> done without checking if the input argument is all numeric. So, an
>> atoi conversion is done on any character provided as input and the
>> CPU idle_set operation continues with that integer value, which may
>> not be what is intended or entirely correct.
>>
>> A similar check is present for cpufreq-set already.
>>
>> This patch adds a check to see that the idle_set value is all numeric
>> before doing a string-to-int conversion.
>>
>> Signed-off-by: Brahadambal Srinivasan <latha@linux.vnet.ibm.com>
>> ---
>>   tools/power/cpupower/utils/cpuidle-set.c | 39 +++++++++++++++++++++---
>>   1 file changed, 34 insertions(+), 5 deletions(-)
>>
>> diff --git a/tools/power/cpupower/utils/cpuidle-set.c 
>> b/tools/power/cpupower/utils/cpuidle-set.c
>> index 46158928f9ad..b3dec48e7141 100644
>> --- a/tools/power/cpupower/utils/cpuidle-set.c
>> +++ b/tools/power/cpupower/utils/cpuidle-set.c
>> @@ -21,6 +21,19 @@ static struct option info_opts[] = {
>>        { },
>>   };
>> +int is_number(char *arg)
>> +{
>> +    size_t len, i = 0;
>> +
>> +    len = strlen(arg);
>> +
>> +    for (i = 0; i < len; i++) {
>> +        if (!isdigit(arg[i]))
>> +            return 0;
>> +    }
>> +
>> +    return 1;
>> +}
> 
> Any reason why you can't use isdigit()? Please see isdigit()
> usages examples in other tools and cpupower itself.
> 

Okay - Let me clarify my question a bit. What I am looking for
is if there is an existing function that can do what you are doing
here. It appears there is one:

Please take a look at the exiting is_number() in
tools/perf/tests/pmu-events.c

It uses strtod() to do what you are doing with strlen() and loop
over it with isdigit().

It is static and you can't use it as is.

Unfortunately you will have to duplicate this routine to keep
cpupower not dependent on tools/lib. Please add it to cpupower
lib instead.

thanks,
-- Shuah
diff mbox series

Patch

diff --git a/tools/power/cpupower/utils/cpuidle-set.c b/tools/power/cpupower/utils/cpuidle-set.c
index 46158928f9ad..b3dec48e7141 100644
--- a/tools/power/cpupower/utils/cpuidle-set.c
+++ b/tools/power/cpupower/utils/cpuidle-set.c
@@ -21,6 +21,19 @@  static struct option info_opts[] = {
      { },
 };
 
+int is_number(char *arg)
+{
+	size_t len, i = 0;
+
+	len = strlen(arg);
+
+	for (i = 0; i < len; i++) {
+		if (!isdigit(arg[i]))
+			return 0;
+	}
+
+	return 1;
+}
 
 int cmd_idle_set(int argc, char **argv)
 {
@@ -47,7 +60,12 @@  int cmd_idle_set(int argc, char **argv)
 				break;
 			}
 			param = ret;
-			idlestate = atoi(optarg);
+			if (is_number(optarg))
+				idlestate = atoi(optarg);
+			else {
+				printf(_("Bad idle_set value : %s. Integer expected\n"), optarg);
+				exit(EXIT_FAILURE);
+			}
 			break;
 		case 'e':
 			if (param) {
@@ -56,7 +74,12 @@  int cmd_idle_set(int argc, char **argv)
 				break;
 			}
 			param = ret;
-			idlestate = atoi(optarg);
+			if (is_number(optarg))
+				idlestate = atoi(optarg);
+			else {
+				printf(_("Bad idle_set value : %s\n. Integer expected"), optarg);
+				exit(EXIT_FAILURE);
+			}
 			break;
 		case 'D':
 			if (param) {
@@ -65,9 +88,15 @@  int cmd_idle_set(int argc, char **argv)
 				break;
 			}
 			param = ret;
-			latency = strtoull(optarg, &endptr, 10);
-			if (*endptr != '\0') {
-				printf(_("Bad latency value: %s\n"), optarg);
+			if (is_number(optarg)) {
+				latency = strtoull(optarg, &endptr, 10);
+				if (*endptr != '\0') {
+					printf(_("Bad latency value: %s. Integer expected\n"),
+						optarg);
+					exit(EXIT_FAILURE);
+				}
+			} else {
+				printf(_("Bad latency value: %s. Integer expected\n"), optarg);
 				exit(EXIT_FAILURE);
 			}
 			break;