From: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
To: okaya@kernel.org
Cc: dev@dpdk.org
Subject: Re: [PATCH v2 08/11] malloc: check result of rte_mem_virt2memseg
Date: Tue, 22 Nov 2022 18:52:39 +0300 [thread overview]
Message-ID: <20221122185239.665c2edc@sovereign> (raw)
In-Reply-To: <20221121223208.1147154-9-okaya@kernel.org>
2022-11-21 17:32 (UTC-0500), okaya@kernel.org:
> From: Sinan Kaya <okaya@kernel.org>
>
> In malloc_elem_find_max_iova_contig result of call to rte_mem_virt2memseg
> is dereferenced here and may be null.
>
> Signed-off-by: Sinan Kaya <okaya@kernel.org>
> ---
> lib/eal/common/malloc_elem.c | 11 ++++++++---
> lib/eal/common/malloc_heap.c | 2 +-
> 2 files changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/lib/eal/common/malloc_elem.c b/lib/eal/common/malloc_elem.c
> index 83f05497cc..8f49812846 100644
> --- a/lib/eal/common/malloc_elem.c
> +++ b/lib/eal/common/malloc_elem.c
> @@ -63,6 +63,8 @@ malloc_elem_find_max_iova_contig(struct malloc_elem *elem, size_t align)
>
> cur_page = RTE_PTR_ALIGN_FLOOR(contig_seg_start, page_sz);
> ms = rte_mem_virt2memseg(cur_page, elem->msl);
> + if (ms == NULL)
> + return 0;
>
> /* do first iteration outside the loop */
> page_end = RTE_PTR_ADD(cur_page, page_sz);
> @@ -91,9 +93,12 @@ malloc_elem_find_max_iova_contig(struct malloc_elem *elem, size_t align)
> * we're not blowing past data end.
> */
> ms = rte_mem_virt2memseg(contig_seg_start, elem->msl);
> - cur_page = ms->addr;
> - /* don't trigger another recalculation */
> - expected_iova = ms->iova;
> + if (ms != NULL) {
> + cur_page = ms->addr;
> +
> + /* don't trigger another recalculation */
> + expected_iova = ms->iova;
> + }
> continue;
> }
> /* cur_seg_end ends on a page boundary or on data end. if we're
> diff --git a/lib/eal/common/malloc_heap.c b/lib/eal/common/malloc_heap.c
> index 3f41430e42..88270ce4d2 100644
> --- a/lib/eal/common/malloc_heap.c
> +++ b/lib/eal/common/malloc_heap.c
> @@ -930,7 +930,7 @@ malloc_heap_free(struct malloc_elem *elem)
> const struct rte_memseg *tmp =
> rte_mem_virt2memseg(aligned_start, msl);
>
> - if (tmp->flags & RTE_MEMSEG_FLAG_DO_NOT_FREE) {
> + if ((tmp != NULL) && (tmp->flags & RTE_MEMSEG_FLAG_DO_NOT_FREE)) {
> /* this is an unfreeable segment, so move start */
> aligned_start = RTE_PTR_ADD(tmp->addr, tmp->len);
> }
In these three places "ms" or "tmp" are from the MSL by construction.
I think RTE_ASSERT() would be sufficient.
next prev parent reply other threads:[~2022-11-22 15:52 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-21 22:31 [PATCH v2 00/11] codeql fixes for various subsystems okaya
2022-11-21 22:32 ` [PATCH v2 01/11] ethdev: check return result of rte_eth_dev_info_get okaya
2022-11-21 22:32 ` [PATCH v2 02/11] net/tap: check if name is null okaya
2022-11-21 22:32 ` [PATCH v2 03/11] memzone: check result of rte_fbarray_get okaya
2022-11-21 22:32 ` [PATCH v2 04/11] memzone: check result of malloc_elem_from_data okaya
2022-11-22 15:52 ` Dmitry Kozlyuk
2022-11-21 22:32 ` [PATCH v2 05/11] malloc: malloc_elem_join_adjacent_free can return null okaya
2022-11-22 15:52 ` Dmitry Kozlyuk
2022-11-21 22:32 ` [PATCH v2 06/11] malloc: check result of rte_mem_virt2memseg_list okaya
2022-11-22 15:52 ` Dmitry Kozlyuk
2022-11-21 22:32 ` [PATCH v2 07/11] malloc: check result of rte_fbarray_get okaya
2022-11-22 15:52 ` Dmitry Kozlyuk
2022-11-21 22:32 ` [PATCH v2 08/11] malloc: check result of rte_mem_virt2memseg okaya
2022-11-22 15:52 ` Dmitry Kozlyuk [this message]
2022-11-21 22:32 ` [PATCH v2 09/11] malloc: check result of malloc_elem_free okaya
2022-11-22 15:52 ` Dmitry Kozlyuk
2022-11-22 15:24 ` [PATCH v2 00/11] codeql fixes for various subsystems David Marchand
2022-11-22 15:26 ` Sinan Kaya
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221122185239.665c2edc@sovereign \
--to=dmitry.kozliuk@gmail.com \
--cc=dev@dpdk.org \
--cc=okaya@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).