Skip to content

Commit

Permalink
lib/test_ubsan.c: VLA no longer used in kernel
Browse files Browse the repository at this point in the history
Since we now build with -Wvla, any use of VLA throws a warning.
Including this test, so...  maybe we should just remove the test?

  lib/test_ubsan.c: In function 'test_ubsan_vla_bound_not_positive':
  lib/test_ubsan.c:48:2: warning: ISO C90 forbids variable length array 'buf' [-Wvla]

For the out-of-bounds test, switch to non-VLA setup.

  lib/test_ubsan.c: In function 'test_ubsan_out_of_bounds':
  lib/test_ubsan.c:64:2: warning: ISO C90 forbids variable length array 'arr' [-Wvla]

Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Olof Johansson <[email protected]>
Acked-by: Dmitry Vyukov <[email protected]>
Cc: Colin Ian King <[email protected]>
Cc: Jinbum Park <[email protected]>
Cc: Andrey Ryabinin <[email protected]>
Cc: Kees Cook <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
olofj authored and torvalds committed Mar 8, 2019
1 parent cdc94a3 commit 9d7ca61
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions lib/test_ubsan.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,6 @@ static void test_ubsan_divrem_overflow(void)
val /= val2;
}

static void test_ubsan_vla_bound_not_positive(void)
{
volatile int size = -1;
char buf[size];

(void)buf;
}

static void test_ubsan_shift_out_of_bounds(void)
{
volatile int val = -1;
Expand All @@ -61,7 +53,7 @@ static void test_ubsan_shift_out_of_bounds(void)
static void test_ubsan_out_of_bounds(void)
{
volatile int i = 4, j = 5;
volatile int arr[i];
volatile int arr[4];

arr[j] = i;
}
Expand Down Expand Up @@ -113,7 +105,6 @@ static const test_ubsan_fp test_ubsan_array[] = {
test_ubsan_mul_overflow,
test_ubsan_negate_overflow,
test_ubsan_divrem_overflow,
test_ubsan_vla_bound_not_positive,
test_ubsan_shift_out_of_bounds,
test_ubsan_out_of_bounds,
test_ubsan_load_invalid_value,
Expand Down

0 comments on commit 9d7ca61

Please sign in to comment.