diff mbox

[PATCHv3,09/10] linux-generic: tm: avoid potential null pointer dereference

Message ID 1464306409-7325-10-git-send-email-bill.fischofer@linaro.org
State Accepted
Commit 2a829066f162ce4848d6e39ee757ab361b7e90e0
Headers show

Commit Message

Bill Fischofer May 26, 2016, 11:46 p.m. UTC 
Signed-off-by: Bill Fischofer <bill.fischofer@linaro.org>
---
 platform/linux-generic/odp_traffic_mngr.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c
index f8995b4..db74ceb 100644
--- a/platform/linux-generic/odp_traffic_mngr.c
+++ b/platform/linux-generic/odp_traffic_mngr.c
@@ -2167,8 +2167,10 @@  static int tm_process_expired_timers(tm_system_t *tm_system,
 		timer_seq = timer_context >> 32;
 		tm_queue_obj = tm_system->queue_num_tbl[queue_num];
 
-		if ((!tm_queue_obj) ||
-		    (tm_queue_obj->timer_reason == NO_CALLBACK) ||
+		if (!tm_queue_obj)
+			return work_done;
+
+		if ((tm_queue_obj->timer_reason == NO_CALLBACK) ||
 		    (!tm_queue_obj->timer_shaper) ||
 		    (tm_queue_obj->timer_seq != timer_seq)) {
 			if (tm_queue_obj->timer_cancels_outstanding != 0)