From 8bea589cfe0fca1a6f560e16ca66a4cf199041a2 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Mon, 4 Apr 2022 22:40:45 +0200 Subject: vppinfra: make _vec_len() read-only Use of _vec_len() to set vector length breaks address sanitizer. Users should use vec_set_len(), vec_inc_len(), vec_dec_len () instead. Type: improvement Change-Id: I441ae948771eb21c23a61f3ff9163bdad74a2cb8 Signed-off-by: Damjan Marion --- src/vppinfra/timing_wheel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/vppinfra/timing_wheel.c') diff --git a/src/vppinfra/timing_wheel.c b/src/vppinfra/timing_wheel.c index 2c46d72a2fe..edd878239cf 100644 --- a/src/vppinfra/timing_wheel.c +++ b/src/vppinfra/timing_wheel.c @@ -185,7 +185,7 @@ free_elt_vector (timing_wheel_t * w, timing_wheel_elt_t * ev) /* Poison free elements so we never use them by mistake. */ if (CLIB_DEBUG > 0) clib_memset (ev, ~0, vec_len (ev) * sizeof (ev[0])); - _vec_len (ev) = 0; + vec_set_len (ev, 0); vec_add1 (w->free_elt_vectors, ev); } @@ -459,7 +459,7 @@ expire_bin (timing_wheel_t * w, /* Adjust for deleted elts. */ if (j < e_len) - _vec_len (expired_user_data) -= e_len - j; + vec_dec_len (expired_user_data, e_len - j); free_elt_vector (w, e); @@ -613,7 +613,7 @@ timing_wheel_advance (timing_wheel_t * w, u64 advance_cpu_time, if (PREDICT_FALSE (current_ti != advance_ti)) { if (w->unexpired_elts_pending_insert) - _vec_len (w->unexpired_elts_pending_insert) = 0; + vec_set_len (w->unexpired_elts_pending_insert, 0); level_index = 0; while (current_ti != advance_ti) @@ -684,7 +684,7 @@ timing_wheel_advance (timing_wheel_t * w, u64 advance_cpu_time, { timing_wheel_elt_t *e; vec_foreach (e, w->unexpired_elts_pending_insert) insert_elt (w, e); - _vec_len (w->unexpired_elts_pending_insert) = 0; + vec_set_len (w->unexpired_elts_pending_insert, 0); } /* Don't advance until necessary. */ -- cgit 1.2.3-korg