Add safe checks for valid pareto input value

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/options.c b/options.c
index ea1ffb13dd8bf95dd0f8c0bb1bbb0a8f257921c0..c240692f6ccc26d3f415f6bbe3a6640ff32348f2 100644 (file)
--- a/options.c
+++ b/options.c
@@ -748,12 +748,18 @@ static int str_random_distribution_cb(void *data, const char *str)
                return 1;
        }
 
                return 1;
        }
 

+       free(nr);
+

        if (td->o.random_distribution == FIO_RAND_DIST_ZIPF)
                td->o.zipf_theta = val;
        if (td->o.random_distribution == FIO_RAND_DIST_ZIPF)
                td->o.zipf_theta = val;

-       else
+       else {
+               if (val <= 0.00 || val >= 1.00) {
+                       log_err("fio: pareto input out of range (0 < input < 1.0)\n");
+                       return 1;
+               }

                td->o.pareto_h = val;
                td->o.pareto_h = val;

+       }

 
 

-       free(nr);

        return 0;
 }
 
        return 0;
 }
 

diff --git a/t/genzipf.c b/t/genzipf.c
index d06f5619b15d38f3c991bb0e20b4e28d35b1effe..c3ab4ae1b1d8608214269dad4dda966d32540130 100644 (file)
--- a/t/genzipf.c
+++ b/t/genzipf.c
@@ -137,6 +137,10 @@ int main(int argc, char *argv[])
        }
 
        val = atof(argv[2]);
        }
 
        val = atof(argv[2]);

+       if ((val >= 1.00 || val < 0.00) && !use_zipf) {
+               printf("pareto input must be > 0.00 and < 1.00\n");
+               return 1;
+       }

 
        nranges = DEF_NR;
        output_nranges = DEF_NR_OUTPUT;
 
        nranges = DEF_NR;
        output_nranges = DEF_NR_OUTPUT;