From a21889174f48434b04997c250369c1e31d69e196 Mon Sep 17 00:00:00 2001 From: Dmitry Valter Date: Thu, 18 Jan 2024 09:09:12 +0000 Subject: vppinfra: fix clib_array_mask_u32 OOB reads Handle non-even n_elts for the larger array instead of reading past the source buffer. Type: fix Fixes: f62ed3f9c1ec3e8db36f63d6a54f46b7bea43723 Signed-off-by: Dmitry Valter Change-Id: Ic1708a3f33fe71ca752345b5c77b6ae7a2d42bcd --- src/vppinfra/test/array_mask.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'src/vppinfra/test/array_mask.c') diff --git a/src/vppinfra/test/array_mask.c b/src/vppinfra/test/array_mask.c index c3b475c431b..4d8fc7c59e2 100644 --- a/src/vppinfra/test/array_mask.c +++ b/src/vppinfra/test/array_mask.c @@ -83,7 +83,7 @@ static array_mask_test_t tests[] = { static clib_error_t * test_clib_array_mask_u32 (clib_error_t *err) { - u32 i, j; + u32 i, j, len; for (i = 0; i < ARRAY_LEN (tests) - 1; i++) { u32 src[256]; @@ -102,6 +102,27 @@ test_clib_array_mask_u32 (clib_error_t *err) } } + for (i = 0; i < ARRAY_LEN (tests) - 1; i++) + { + for (len = 1; len <= 256; len++) + { + u32 src[len]; + for (j = 0; j < ARRAY_LEN (src); j++) + src[j] = j; + + array_mask_test_t *t = tests + i; + clib_array_mask_u32_wrapper (src, t->mask, ARRAY_LEN (src)); + for (j = 0; j < ARRAY_LEN (src); j++) + { + if (src[j] != t->expected[j]) + return clib_error_return (err, + "testcase %u failed at " + "(src[%u] = 0x%x, expected 0x%x)", + i, j, src[j], t->expected[j]); + } + } + } + u32 src[10] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 }; array_mask_test_t *t = tests + i; -- cgit 1.2.3-korg