Files
vpp/src/plugins/unittest/pool_test.c
T
Jieqiang Wang 039f289e51 vppinfra: fix potential memory access error in _pool_init_fixed
_pool_init_fixed uses mmap to initialize a fixed-size and preallocated
pool, whose size is the sum of vector_size and free_index_size with
alignment to the CLIB_CACHE_LINE_BYTES and page size. In this way
vector_size equals to pool_header_t + vec_header_t + elt_size * max_elts
so moving to the end of the pool space should be pool_header_t pointer +
vector_size, instead of vec_header_t pointer + vector_size.

Simple code to reproduce this error:

u64 *pool;
pool_init_fixed(pool, 2042);

Improve unit test to cover this case

Type: fix

Signed-off-by: Jieqiang Wang <jieqiang.wang@arm.com>
Reviewed-by: Lijian Zhang <lijian.zhang@arm.com>
Reviewed-by: Tianyu Li <tianyu.li@arm.com>
Change-Id: If088ef89b3dcb2d874ee837ae9da60983b14615c
Signed-off-by: Dave Barach <dave@barachs.net>
2021-10-04 10:30:54 -04:00

71 lines
1.6 KiB
C

/*
* Copyright (c) 2021 Dave Barach
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <vlib/vlib.h>
static clib_error_t *
test_pool_command_fn (vlib_main_t *vm, unformat_input_t *input,
vlib_cli_command_t *cmd)
{
static int sizes[] = { 3, 31, 2042, 2048 };
int i, j;
u64 *pool;
uword this_size;
for (j = 0; j < ARRAY_LEN (sizes); j++)
{
this_size = sizes[j];
pool_init_fixed (pool, this_size);
i = 0;
while (pool_free_elts (pool) > 0)
{
u64 *p __attribute__ ((unused));
pool_get (pool, p);
i++;
}
vlib_cli_output (vm, "allocated %d elts\n", i);
for (--i; i >= 0; i--)
{
pool_put_index (pool, i);
}
ALWAYS_ASSERT (pool_free_elts (pool) == this_size);
}
vlib_cli_output (vm, "Test succeeded...\n");
return 0;
}
VLIB_CLI_COMMAND (test_pool_command, static) = {
.path = "test pool",
.short_help = "vppinfra pool.h tests",
.function = test_pool_command_fn,
};
/*
* fd.io coding-style-patch-verification: ON
*
* Local Variables:
* eval: (c-set-style "gnu")
* End:
*/