diff options
| author |   Damjan Marion <damarion@cisco.com> | 2022-04-04 22:40:45 +0200 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2022-04-04 23:17:13 +0000 |
| commit | 8bea589cfe0fca1a6f560e16ca66a4cf199041a2 (patch) | |
| tree | cf2767f8f5f31344468b65e14baa3f1a4c85fb91 /src/plugins/dpdk/device | |
| parent | a2b358b1faf6e762e1d29a931d83c7735ac9a77d (diff) | |
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 <damarion@cisco.com>
Diffstat (limited to 'src/plugins/dpdk/device')
| -rw-r--r-- | src/plugins/dpdk/device/cli.c | 6 | ||||
| -rw-r--r-- | src/plugins/dpdk/device/dpdk_priv.h | 4 | ||||
| -rw-r--r-- | src/plugins/dpdk/device/init.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/dpdk/device/cli.c b/src/plugins/dpdk/device/cli.c index f49a94fa98f..af522a56198 100644 --- a/src/plugins/dpdk/device/cli.c +++ b/src/plugins/dpdk/device/cli.c @@ -142,7 +142,7 @@ show_dpdk_physmem (vlib_main_t * vm, unformat_input_t * input, err = clib_error_return_unix (0, "read"); goto error; } - _vec_len (s) = len + (n < 0 ? 0 : n); + vec_set_len (s, len + (n < 0 ? 0 : n)); } vlib_cli_output (vm, "%v", s); @@ -198,7 +198,7 @@ test_dpdk_buffer (vlib_main_t * vm, unformat_input_t * input, first = vec_len (allocated_buffers) - n_free; vlib_buffer_free (vm, allocated_buffers + first, n_free); - _vec_len (allocated_buffers) = first; + vec_set_len (allocated_buffers, first); } if (n_alloc) { @@ -208,7 +208,7 @@ test_dpdk_buffer (vlib_main_t * vm, unformat_input_t * input, actual_alloc = vlib_buffer_alloc (vm, allocated_buffers + first, n_alloc); - _vec_len (allocated_buffers) = first + actual_alloc; + vec_set_len (allocated_buffers, first + actual_alloc); if (actual_alloc < n_alloc) vlib_cli_output (vm, "WARNING: only allocated %d buffers", diff --git a/src/plugins/dpdk/device/dpdk_priv.h b/src/plugins/dpdk/device/dpdk_priv.h index 4e4438a007e..ed30cd8cd23 100644 --- a/src/plugins/dpdk/device/dpdk_priv.h +++ b/src/plugins/dpdk/device/dpdk_priv.h @@ -63,11 +63,11 @@ dpdk_get_xstats (dpdk_device_t * xd) ret = rte_eth_xstats_get (xd->port_id, xd->xstats, len); if (ret < 0 || ret > len) { - _vec_len (xd->xstats) = 0; + vec_set_len (xd->xstats, 0); return; } - _vec_len (xd->xstats) = len; + vec_set_len (xd->xstats, len); } #define DPDK_UPDATE_COUNTER(vnm, tidx, xd, stat, cnt) \ diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c index a94f83bc42d..9d68775d86a 100644 --- a/src/plugins/dpdk/device/init.c +++ b/src/plugins/dpdk/device/init.c @@ -921,7 +921,7 @@ dpdk_log_read_ready (clib_file_t * uf) n = read (uf->file_descriptor, s + len, n_try); if (n < 0 && errno != EAGAIN) return clib_error_return_unix (0, "read"); - _vec_len (s) = len + (n < 0 ? 0 : n); + vec_set_len (s, len + (n < 0 ? 0 : n)); } unformat_init_vector (&input, s); @@ -1254,7 +1254,7 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) /* NULL terminate the "argv" vector, in case of stupidity */ vec_add1 (conf->eal_init_args, 0); - _vec_len (conf->eal_init_args) -= 1; + vec_dec_len (conf->eal_init_args, 1); /* Set up DPDK eal and packet mbuf pool early. */ |