diff options
| author |   Dmitry Valter <d-valter@yandex-team.com> | 2024-01-18 09:09:12 +0000 |
|---|---|---|
| committer |   Damjan Marion <dmarion@0xa5.net> | 2024-01-23 22:39:43 +0000 |
| commit | a21889174f48434b04997c250369c1e31d69e196 (patch) | |
| tree | 944cc5cf70e3cc38af3eef6a4464d1eca06ddefb /src/vppinfra/vector | |
| parent | 3109d1c29872a18642088b05fa1e2e2291241cc3 (diff) | |
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 <d-valter@yandex-team.com>
Change-Id: Ic1708a3f33fe71ca752345b5c77b6ae7a2d42bcd
Diffstat (limited to 'src/vppinfra/vector')
| -rw-r--r-- | src/vppinfra/vector/array_mask.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/vppinfra/vector/array_mask.h b/src/vppinfra/vector/array_mask.h index 39bcedcd191..ba22d79560f 100644 --- a/src/vppinfra/vector/array_mask.h +++ b/src/vppinfra/vector/array_mask.h @@ -26,8 +26,8 @@ clib_array_mask_u32 (u32 *src, u32 mask, u32 n_elts) u32x16_mask_store (r & mask16, src, m); return; } - for (int i = 0; i < n_elts; i += 16) - *((u32x16u *) (src + i)) &= mask16; + for (; n_elts >= 16; n_elts -= 16, src += 16) + *((u32x16u *) src) &= mask16; *((u32x16u *) (src + n_elts - 16)) &= mask16; #elif defined(CLIB_HAVE_VEC256) u32x8 mask8 = u32x8_splat (mask); @@ -60,8 +60,8 @@ clib_array_mask_u32 (u32 *src, u32 mask, u32 n_elts) } #endif - for (int i = 0; i < n_elts; i += 8) - *((u32x8u *) (src + i)) &= mask8; + for (; n_elts >= 8; n_elts -= 8, src += 8) + *((u32x8u *) src) &= mask8; *((u32x8u *) (src + n_elts - 8)) &= mask8; #elif defined(CLIB_HAVE_VEC128) u32x4 mask4 = u32x4_splat (mask); @@ -79,8 +79,8 @@ clib_array_mask_u32 (u32 *src, u32 mask, u32 n_elts) return; } - for (int i = 0; i < n_elts; i += 4) - *((u32x4u *) (src + i)) &= mask4; + for (; n_elts >= 4; n_elts -= 4, src += 4) + *((u32x4u *) src) &= mask4; *((u32x4u *) (src + n_elts - 4)) &= mask4; return; #else |