d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fbarray: fix potential null-dereference

Browse Source 
We get pointer to mask before we check if fbarray is NULL. Fix
by moving getting mask pointer to until after NULL check.

Coverity issue: 272579
Fixes: c44d09811b40 ("eal: add shared indexed file-backed array")

Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
Acked-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
This commit is contained in:
Anatoly Burakov 2018-04-17 16:44:07 +01:00 committed by Thomas Monjalon
parent 2bcbc4d12c
commit f9a4f1b462
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/librte_eal/common/eal_common_fbarray.c
View File

@ -355,7 +355,7 @@ find_contig(const struct rte_fbarray *arr, unsigned int start, bool used)
static int static int
set_used(struct rte_fbarray *arr, unsigned int idx, bool used) set_used(struct rte_fbarray *arr, unsigned int idx, bool used)
{ {
struct used_mask *msk = get_used_mask(arr->data, arr->elt_sz, arr->len); struct used_mask *msk;
uint64_t msk_bit = 1ULL << MASK_LEN_TO_MOD(idx); uint64_t msk_bit = 1ULL << MASK_LEN_TO_MOD(idx);
unsigned int msk_idx = MASK_LEN_TO_IDX(idx); unsigned int msk_idx = MASK_LEN_TO_IDX(idx);
bool already_used; bool already_used;
@ -365,6 +365,7 @@ set_used(struct rte_fbarray *arr, unsigned int idx, bool used)
rte_errno = EINVAL; rte_errno = EINVAL;
return -1; return -1;
} }
msk = get_used_mask(arr->data, arr->elt_sz, arr->len);
ret = 0; ret = 0;
/* prevent array from changing under us */ /* prevent array from changing under us */