diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-05-02 09:02:16 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-05-02 09:02:16 +0300 |
| commit | d2cb798d2d8ceb0d194721a2cb0e577b4b927573 (patch) | |
| tree | 81f20ac7647c63d13e2f6ff2c357648abd759018 /lib/test_ubsan.c | |
| parent | 7f0020417b7bceaa10cf9e1efe2b3f5c554d972e (diff) | |
| parent | aeaee199900ee618e676698d21e4ac788f54572f (diff) | |
| download | linux-rolling-stable.tar.xz | |
Merge v6.14.5linux-rolling-stable
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'lib/test_ubsan.c')
| -rw-r--r-- | lib/test_ubsan.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/lib/test_ubsan.c b/lib/test_ubsan.c index 5d7b10e98610..63b7566e7863 100644 --- a/lib/test_ubsan.c +++ b/lib/test_ubsan.c @@ -68,18 +68,22 @@ static void test_ubsan_shift_out_of_bounds(void) static void test_ubsan_out_of_bounds(void) { - volatile int i = 4, j = 5, k = -1; - volatile char above[4] = { }; /* Protect surrounding memory. */ - volatile int arr[4]; - volatile char below[4] = { }; /* Protect surrounding memory. */ + int i = 4, j = 4, k = -1; + volatile struct { + char above[4]; /* Protect surrounding memory. */ + int arr[4]; + char below[4]; /* Protect surrounding memory. */ + } data; - above[0] = below[0]; + OPTIMIZER_HIDE_VAR(i); + OPTIMIZER_HIDE_VAR(j); + OPTIMIZER_HIDE_VAR(k); UBSAN_TEST(CONFIG_UBSAN_BOUNDS, "above"); - arr[j] = i; + data.arr[j] = i; UBSAN_TEST(CONFIG_UBSAN_BOUNDS, "below"); - arr[k] = i; + data.arr[k] = i; } enum ubsan_test_enum { |