From 3c724258f3c66bd2315b722625db8a9826b46b26 Mon Sep 17 00:00:00 2001 From: Zhang Qian Date: Mon, 21 May 2018 11:24:04 +0800 Subject: [PATCH] qcacmn: Add null pointer check in qdf_dp_trace In hdd_tx_timeout(), null nbuf is passed to qdf_dp_trace(). This results a null pointer dereference when getting data buffer. Since data buffer is not mandory for qdf_dp_add_record(), add null nbuf check in qdf_dp_trace(). Change-Id: If5fb4753d382d8f29bdf4d934a7910a28a7c76aa CRs-Fixed: 2244543 --- qdf/linux/src/qdf_trace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qdf/linux/src/qdf_trace.c b/qdf/linux/src/qdf_trace.c index 21ad9eef3154..39b09ca03480 100644 --- a/qdf/linux/src/qdf_trace.c +++ b/qdf/linux/src/qdf_trace.c @@ -1970,7 +1970,8 @@ void qdf_dp_trace(qdf_nbuf_t nbuf, enum QDF_DP_TRACE_ID code, uint8_t pdev_id, if (qdf_dp_enable_check(nbuf, code, dir) == false) return; - qdf_dp_add_record(code, pdev_id, qdf_nbuf_data(nbuf), size, NULL, 0, + qdf_dp_add_record(code, pdev_id, nbuf ? qdf_nbuf_data(nbuf) : NULL, + size, NULL, 0, (nbuf) ? QDF_NBUF_CB_DP_TRACE_PRINT(nbuf) : false); } qdf_export_symbol(qdf_dp_trace);