[dpdk-dev] [PATCH 1/2] timer: fix null pointer dereference
Erik Gabriel Carrillo
erik.g.carrillo at intel.com
Mon Jul 15 17:39:31 CEST 2019
If the timer subsystem is not initialized before rte_timer_manage (for
example) is invoked, a pointer to a shared hugepage memory region will
still be null and dereferenced when it is checked for validity; handle
this case.
Fixes: c0749f7096c7 ("timer: allow management in shared memory")
Cc: stable at dpdk.org
Signed-off-by: Erik Gabriel Carrillo <erik.g.carrillo at intel.com>
---
lib/librte_timer/rte_timer.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/librte_timer/rte_timer.c b/lib/librte_timer/rte_timer.c
index 71dffd2..bdcf05d 100644
--- a/lib/librte_timer/rte_timer.c
+++ b/lib/librte_timer/rte_timer.c
@@ -85,7 +85,8 @@ static struct rte_timer_data default_timer_data;
static inline int
timer_data_valid(uint32_t id)
{
- return !!(rte_timer_data_arr[id].internal_flags & FL_ALLOCATED);
+ return rte_timer_data_arr &&
+ (rte_timer_data_arr[id].internal_flags & FL_ALLOCATED);
}
/* validate ID and retrieve timer data pointer, or return error value */
--
2.6.4
More information about the dev
mailing list