selftests/bpf: Fix test_progs's parsing of test numbers
authorAndrii Nakryiko <andriin@fb.com>
Sat, 14 Mar 2020 01:39:31 +0000 (18:39 -0700)
committerDaniel Borkmann <daniel@iogearbox.net>
Tue, 17 Mar 2020 18:30:46 +0000 (19:30 +0100)
When specifying disjoint set of tests, test_progs doesn't set skipped test's
array elements to false. This leads to spurious execution of tests that should
have been skipped. Fix it by explicitly initializing them to false.

Fixes: 3a516a0a3a7b ("selftests/bpf: add sub-tests support for test_progs")
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Link: https://lore.kernel.org/bpf/20200314013932.4035712-2-andriin@fb.com
tools/testing/selftests/bpf/test_progs.c

index dc12fd0de1c2c9e0a3069702af59c7abe7b62873..c8cb407482c64829246cc5da2babf52e60a21be4 100644 (file)
@@ -424,7 +424,7 @@ err:
 
 int parse_num_list(const char *s, struct test_selector *sel)
 {
-       int i, set_len = 0, num, start = 0, end = -1;
+       int i, set_len = 0, new_len, num, start = 0, end = -1;
        bool *set = NULL, *tmp, parsing_end = false;
        char *next;
 
@@ -459,18 +459,19 @@ int parse_num_list(const char *s, struct test_selector *sel)
                        return -EINVAL;
 
                if (end + 1 > set_len) {
-                       set_len = end + 1;
-                       tmp = realloc(set, set_len);
+                       new_len = end + 1;
+                       tmp = realloc(set, new_len);
                        if (!tmp) {
                                free(set);
                                return -ENOMEM;
                        }
+                       for (i = set_len; i < start; i++)
+                               tmp[i] = false;
                        set = tmp;
+                       set_len = new_len;
                }
-               for (i = start; i <= end; i++) {
+               for (i = start; i <= end; i++)
                        set[i] = true;
-               }
-
        }
 
        if (!set)