diff mbox series

[v2,06/11] malloc: check result of rte_mem_virt2memseg_list

Message ID	20221121223208.1147154-7-okaya@kernel.org (mailing list archive)
State	Superseded, archived
Headers	From: okaya@kernel.org To: dev@dpdk.org Cc: Sinan Kaya <okaya@kernel.org> Subject: [PATCH v2 06/11] malloc: check result of rte_mem_virt2memseg_list Date: Mon, 21 Nov 2022 17:32:05 -0500 Message-Id: <20221121223208.1147154-7-okaya@kernel.org> In-Reply-To: <20221121223208.1147154-1-okaya@kernel.org> References: <20221121223208.1147154-1-okaya@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: dev-bounces@dpdk.org
Series	codeql fixes for various subsystems \| [v2,00/11] codeql fixes for various subsystems [v2,01/11] ethdev: check return result of rte_eth_dev_info_get [v2,02/11] net/tap: check if name is null [v2,03/11] memzone: check result of rte_fbarray_get [v2,04/11] memzone: check result of malloc_elem_from_data [v2,05/11] malloc: malloc_elem_join_adjacent_free can return null [v2,06/11] malloc: check result of rte_mem_virt2memseg_list [v2,07/11] malloc: check result of rte_fbarray_get [v2,08/11] malloc: check result of rte_mem_virt2memseg [v2,09/11] malloc: check result of malloc_elem_free

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Sinan Kaya Nov. 21, 2022, 10:32 p.m. UTC

  From: Sinan Kaya <okaya@kernel.org>

In alloc_pages_on_heap result of call to rte_mem_virt2memseg_list
is dereferenced here and may be null.

Signed-off-by: Sinan Kaya <okaya@kernel.org>
---
 lib/eal/common/malloc_heap.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Dmitry Kozlyuk Nov. 22, 2022, 3:52 p.m. UTC | #1

2022-11-21 17:32 (UTC-0500), okaya@kernel.org:
> From: Sinan Kaya <okaya@kernel.org>
> 
> In alloc_pages_on_heap result of call to rte_mem_virt2memseg_list
> is dereferenced here and may be null.
> 
> Signed-off-by: Sinan Kaya <okaya@kernel.org>
> ---
>  lib/eal/common/malloc_heap.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/lib/eal/common/malloc_heap.c b/lib/eal/common/malloc_heap.c
> index 503e551bf9..3f41430e42 100644
> --- a/lib/eal/common/malloc_heap.c
> +++ b/lib/eal/common/malloc_heap.c
> @@ -323,6 +323,8 @@ alloc_pages_on_heap(struct malloc_heap *heap, uint64_t pg_sz, size_t elt_size,
>  
>  	map_addr = ms[0]->addr;
>  	msl = rte_mem_virt2memseg_list(map_addr);
> +	if (msl == NULL)
> +		return NULL;

It is not really possible, because the memory lock is held,
so "map_addr" cannot be unmapped/remapped concurrently,
and "ms" belongs to some MSL by definition of memseg.
RTE_ASSERT() can be added for clarity.

diff mbox series

Patch

diff --git a/lib/eal/common/malloc_heap.c b/lib/eal/common/malloc_heap.c
index 503e551bf9..3f41430e42 100644
--- a/lib/eal/common/malloc_heap.c
+++ b/lib/eal/common/malloc_heap.c
@@ -323,6 +323,8 @@  alloc_pages_on_heap(struct malloc_heap *heap, uint64_t pg_sz, size_t elt_size,
 
 	map_addr = ms[0]->addr;
 	msl = rte_mem_virt2memseg_list(map_addr);
+	if (msl == NULL)
+		return NULL;
 
 	/* check if we wanted contiguous memory but didn't get it */
 	if (contig && !eal_memalloc_is_contig(msl, map_addr, alloc_sz)) {