From 7c265d301e80117a5caa69a1920a431ae121e6ff Mon Sep 17 00:00:00 2001 From: jitiphil Date: Tue, 27 Nov 2018 17:24:23 +0530 Subject: [PATCH] qcacmn: Packet stat collection failure Change made I7fd67b02c3b7cb4f1bfe7c6f4641f6d881e25abd to fix possible NULL dereference of pkt_stats_dump caused pkt stats collection to fail as pkt_stats_dump is NULL from cds_pkt_stats_to_logger_thread. Move NULL check for pkt_stats_dump to just before it is dereferenced Change-Id: I0f4c9d58f0d4d17d6c26bfbbd79f6447dd52230b CRs-Fixed: 2358139 --- utils/logging/src/wlan_logging_sock_svc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/logging/src/wlan_logging_sock_svc.c b/utils/logging/src/wlan_logging_sock_svc.c index b36395025b37..c7770a8bc9a2 100644 --- a/utils/logging/src/wlan_logging_sock_svc.c +++ b/utils/logging/src/wlan_logging_sock_svc.c @@ -1252,7 +1252,7 @@ void wlan_pkt_stats_to_logger_thread(void *pl_hdr, void *pkt_dump, void *data) spin_lock_irqsave(&gwlan_logging.pkt_stats_lock, flags); - if (!gwlan_logging.pkt_stats_pcur_node || (NULL == pkt_stats_dump)) { + if (!gwlan_logging.pkt_stats_pcur_node) { spin_unlock_irqrestore(&gwlan_logging.pkt_stats_lock, flags); return; } @@ -1285,7 +1285,7 @@ void wlan_pkt_stats_to_logger_thread(void *pl_hdr, void *pkt_dump, void *data) pktlog_hdr->size), data, pktlog_hdr->size); - if (pkt_stats_dump->type == STOP_MONITOR) { + if (pkt_stats_dump && pkt_stats_dump->type == STOP_MONITOR) { wake_up_thread = true; wlan_get_pkt_stats_free_node(); }