diff mbox series

[v2,07/11] malloc: check result of rte_fbarray_get

Message ID	20221121223208.1147154-8-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 07/11] malloc: check result of rte_fbarray_get Date: Mon, 21 Nov 2022 17:32:06 -0500 Message-Id: <20221121223208.1147154-8-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 eal_memalloc_is_contig result of call to rte_fbarray_get
is dereferenced here and may be null.

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

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 eal_memalloc_is_contig result of call to rte_fbarray_get
> is dereferenced here and may be null.
> 
> Signed-off-by: Sinan Kaya <okaya@kernel.org>
> ---
>  lib/eal/common/eal_common_memalloc.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/lib/eal/common/eal_common_memalloc.c b/lib/eal/common/eal_common_memalloc.c
> index ab04479c1c..24506f8447 100644
> --- a/lib/eal/common/eal_common_memalloc.c
> +++ b/lib/eal/common/eal_common_memalloc.c
> @@ -126,6 +126,9 @@ eal_memalloc_is_contig(const struct rte_memseg_list *msl, void *start,
>  
>  		/* skip first iteration */
>  		ms = rte_fbarray_get(&msl->memseg_arr, start_seg);
> +		if (ms == NULL)
> +			return false;
> +
>  		cur = ms->iova;
>  		expected = cur + pgsz;
>  
> @@ -137,7 +140,7 @@ eal_memalloc_is_contig(const struct rte_memseg_list *msl, void *start,
>  				cur_seg++, expected += pgsz) {
>  			ms = rte_fbarray_get(&msl->memseg_arr, cur_seg);
>  
> -			if (ms->iova != expected)
> +			if ((ms != NULL) && (ms->iova != expected))
>  				return false;
>  		}
>  	}

Invariant: "msl->memseg_arr" elements for existing memsegs are used.
RTE_ASSERT(rte_fbarray_is_used(&msl->memseg_arr, ...)) would be sufficient.

diff mbox series

Patch

diff --git a/lib/eal/common/eal_common_memalloc.c b/lib/eal/common/eal_common_memalloc.c
index ab04479c1c..24506f8447 100644
--- a/lib/eal/common/eal_common_memalloc.c
+++ b/lib/eal/common/eal_common_memalloc.c
@@ -126,6 +126,9 @@  eal_memalloc_is_contig(const struct rte_memseg_list *msl, void *start,
 
 		/* skip first iteration */
 		ms = rte_fbarray_get(&msl->memseg_arr, start_seg);
+		if (ms == NULL)
+			return false;
+
 		cur = ms->iova;
 		expected = cur + pgsz;
 
@@ -137,7 +140,7 @@  eal_memalloc_is_contig(const struct rte_memseg_list *msl, void *start,
 				cur_seg++, expected += pgsz) {
 			ms = rte_fbarray_get(&msl->memseg_arr, cur_seg);
 
-			if (ms->iova != expected)
+			if ((ms != NULL) && (ms->iova != expected))
 				return false;
 		}
 	}