[LTP] [PATCH 0/2] Add handling of abnormal input for parse_opts()

[LTP] [PATCH 0/2] Add handling of abnormal input for parse_opts()

[Zhao Gongyi via ltp]

1. Add SAFE_STRTOF
2. Replace atoi/atof with SAFE_STRTOL/SAFE_STRTOF to deal with abnormal
   input for parse_opts()

Zhao Gongyi (2):
  lib/safe_macros: Add SAFE_STRTOF
  lib: Replace atoi/atof with SAFE_STRTOL/SAFE_STRTOF

 include/safe_macros_fn.h  |  3 +++
 include/tst_safe_macros.h |  3 +++
 lib/safe_macros.c         | 26 ++++++++++++++++++++++++++
 lib/tst_test.c            |  8 +++-----
 4 files changed, 35 insertions(+), 5 deletions(-)

--
2.17.1


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

[LTP] [PATCH 1/2] lib/safe_macros: Add SAFE_STRTOF

[Zhao Gongyi via ltp]

Add a new macro SAFE_STRTOF, which is a safe mode of strtof().

Signed-off-by: Zhao Gongyi <zhaogongyi@huawei.com>
---
 include/safe_macros_fn.h  |  3 +++
 include/tst_safe_macros.h |  3 +++
 lib/safe_macros.c         | 26 ++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/include/safe_macros_fn.h b/include/safe_macros_fn.h
index 114d8fd43..546db4ad8 100644
--- a/include/safe_macros_fn.h
+++ b/include/safe_macros_fn.h
@@ -133,6 +133,9 @@ unsigned long safe_strtoul(const char *file, const int lineno,
                            void (cleanup_fn)(void),
                            char *str, unsigned long min, unsigned long max);

+float safe_strtof(const char *file, const int lineno,
+                 void (cleanup_fn)(void), char *str);
+
 long safe_sysconf(const char *file, const int lineno,
 		  void (cleanup_fn)(void), int name);

diff --git a/include/tst_safe_macros.h b/include/tst_safe_macros.h
index ab00dd14a..9ff98e7db 100644
--- a/include/tst_safe_macros.h
+++ b/include/tst_safe_macros.h
@@ -186,6 +186,9 @@ int safe_getgroups(const char *file, const int lineno, int size, gid_t list[]);
 #define SAFE_STRTOUL(str, min, max) \
 	safe_strtoul(__FILE__, __LINE__, NULL, (str), (min), (max))

+#define SAFE_STRTOF(str) \
+	safe_strtof(__FILE__, __LINE__, NULL, (str))
+
 #define SAFE_SYSCONF(name) \
 	safe_sysconf(__FILE__, __LINE__, NULL, name)

diff --git a/lib/safe_macros.c b/lib/safe_macros.c
index d8816631f..954f1d40a 100644
--- a/lib/safe_macros.c
+++ b/lib/safe_macros.c
@@ -21,6 +21,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <malloc.h>
+#include <math.h>
 #include "test.h"
 #include "safe_macros.h"

@@ -629,6 +630,31 @@ unsigned long safe_strtoul(const char *file, const int lineno,
 	return rval;
 }

+float safe_strtof(const char *file, const int lineno,
+		  void (cleanup_fn) (void), char *str)
+{
+	float rval;
+	char *endptr;
+
+	errno = 0;
+	rval = strtof(str, &endptr);
+
+	if ((errno == ERANGE) || (rval == 0)
+	    || (rval == HUGE_VAL) || (rval == -HUGE_VAL)) {
+		tst_brkm_(file, lineno, TBROK | TERRNO, cleanup_fn,
+			"strtof(%s) failed", str);
+		return rval;
+	}
+
+	if (endptr == str || (*endptr != '\0' && *endptr != '\n')) {
+		tst_brkm_(file, lineno, TBROK, cleanup_fn,
+			"Invalid value: '%s'", str);
+		return 0;
+	}
+
+	return rval;
+}
+
 long safe_sysconf(const char *file, const int lineno,
 		  void (cleanup_fn) (void), int name)
 {
--
2.17.1


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

[LTP] [PATCH 2/2] lib: Replace atoi/atof with SAFE_STRTOL/SAFE_STRTOF

[Zhao Gongyi via ltp]

Replace atoi/atof with SAFE_STRTOL/SAFE_STRTOF in parse_opts(),
it is hoped to deal with the abnormal input.

Modify the requirement iterations range from '>= 0' to '> 0',
when iterations' value equal to 0, the test will not run.

Signed-off-by: Zhao Gongyi <zhaogongyi@huawei.com>
---
 lib/tst_test.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/tst_test.c b/lib/tst_test.c
index b62559d75..254229d96 100644
--- a/lib/tst_test.c
+++ b/lib/tst_test.c
@@ -677,15 +677,13 @@ static void parse_opts(int argc, char *argv[])
 			print_test_tags();
 			exit(0);
 		case 'i':
-			iterations = atoi(optarg);
-			if (iterations < 0)
-				tst_brk(TBROK, "Number of iterations (-i) must be >= 0");
+			iterations = SAFE_STRTOL(optarg, 1, INT_MAX);
 		break;
 		case 'I':
 			if (tst_test->max_runtime > 0)
-				tst_test->max_runtime = atoi(optarg);
+				tst_test->max_runtime = SAFE_STRTOL(optarg, 1, INT_MAX);
 			else
-				duration = atof(optarg);
+				duration = SAFE_STRTOF(optarg);
 		break;
 		case 'C':
 #ifdef UCLINUX
--
2.17.1


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH 2/2] lib: Replace atoi/atof with SAFE_STRTOL/SAFE_STRTOF

[Cyril Hrubis]

On Wed, Nov 30, 2022 at 10:19:01AM +0800, Zhao Gongyi via ltp wrote:
> Replace atoi/atof with SAFE_STRTOL/SAFE_STRTOF in parse_opts(),
> it is hoped to deal with the abnormal input.
> 
> Modify the requirement iterations range from '>= 0' to '> 0',
> when iterations' value equal to 0, the test will not run.
> 
> Signed-off-by: Zhao Gongyi <zhaogongyi@huawei.com>
> ---
>  lib/tst_test.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/lib/tst_test.c b/lib/tst_test.c
> index b62559d75..254229d96 100644
> --- a/lib/tst_test.c
> +++ b/lib/tst_test.c
> @@ -677,15 +677,13 @@ static void parse_opts(int argc, char *argv[])
>  			print_test_tags();
>  			exit(0);
>  		case 'i':
> -			iterations = atoi(optarg);
> -			if (iterations < 0)
> -				tst_brk(TBROK, "Number of iterations (-i) must be >= 0");
> +			iterations = SAFE_STRTOL(optarg, 1, INT_MAX);
>  		break;
>  		case 'I':
>  			if (tst_test->max_runtime > 0)
> -				tst_test->max_runtime = atoi(optarg);
> +				tst_test->max_runtime = SAFE_STRTOL(optarg, 1, INT_MAX);
>  			else
> -				duration = atof(optarg);
> +				duration = SAFE_STRTOF(optarg);

Shouldn't we limit the duration to positive numbers here as well?

I guess that we should add min and max option to the SAFE_STRTOF() and
call the conversion with SAFE_STRTOF(optarg, 0.1, HUGE_VALF); here
instead.

>  		break;
>  		case 'C':
>  #ifdef UCLINUX
> --
> 2.17.1
> 
> 
> -- 
> Mailing list info: https://lists.linux.it/listinfo/ltp

-- 
Cyril Hrubis
chrubis@suse.cz

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH 2/2] lib: Replace atoi/atof with SAFE_STRTOL/SAFE_STRTOF

[zhaogongyi via ltp]

Hi Cyril,

> 
> On Wed, Nov 30, 2022 at 10:19:01AM +0800, Zhao Gongyi via ltp wrote:
> > Replace atoi/atof with SAFE_STRTOL/SAFE_STRTOF in parse_opts(), it is
> > hoped to deal with the abnormal input.
> >
> > Modify the requirement iterations range from '>= 0' to '> 0', when
> > iterations' value equal to 0, the test will not run.
> >
> > Signed-off-by: Zhao Gongyi <zhaogongyi@huawei.com>
> > ---
> >  lib/tst_test.c | 8 +++-----
> >  1 file changed, 3 insertions(+), 5 deletions(-)
> >
> > diff --git a/lib/tst_test.c b/lib/tst_test.c index
> > b62559d75..254229d96 100644
> > --- a/lib/tst_test.c
> > +++ b/lib/tst_test.c
> > @@ -677,15 +677,13 @@ static void parse_opts(int argc, char *argv[])
> >  			print_test_tags();
> >  			exit(0);
> >  		case 'i':
> > -			iterations = atoi(optarg);
> > -			if (iterations < 0)
> > -				tst_brk(TBROK, "Number of iterations (-i) must be >=
> 0");
> > +			iterations = SAFE_STRTOL(optarg, 1, INT_MAX);
> >  		break;
> >  		case 'I':
> >  			if (tst_test->max_runtime > 0)
> > -				tst_test->max_runtime = atoi(optarg);
> > +				tst_test->max_runtime = SAFE_STRTOL(optarg, 1,
> INT_MAX);
> >  			else
> > -				duration = atof(optarg);
> > +				duration = SAFE_STRTOF(optarg);
> 
> Shouldn't we limit the duration to positive numbers here as well?
> 
> I guess that we should add min and max option to the SAFE_STRTOF() and
> call the conversion with SAFE_STRTOF(optarg, 0.1, HUGE_VALF); here
> instead.

Agree, it is better to add range checking for SAFE_STRTOF, I have resubmit a new patch to fix it, please see: https://patchwork.ozlabs.org/project/ltp/patch/20221201025141.71227-3-zhaogongyi@huawei.com/

Regards,
Gongyi


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp