[PATCH] iwlwifi: avoid crash on unsupported debug collection

* [PATCH] iwlwifi: avoid crash on unsupported debug collection
@ 2021-02-19 12:35 Johannes Berg
  2021-02-19 14:50 ` Kalle Valo
  2021-02-22  7:23 ` Kalle Valo
  0 siblings, 2 replies; 5+ messages in thread
From: Johannes Berg @ 2021-02-19 12:35 UTC (permalink / raw)
  To: linux-wireless; +Cc: Johannes Berg, Andy Lavr

From: Johannes Berg <johannes.berg@intel.com>

If the opmode doesn't support debug collection (DVM) then don't
crash, but just skip the callback.

Fixes: d01293154c0a ("iwlwifi: dbg: add op_mode callback for collecting debug data.")
Reported-by: Andy Lavr <andy.lavr@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h b/drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h
index 868da7e79a45..e6d2e0994317 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h
@@ -205,6 +205,8 @@ static inline void iwl_op_mode_time_point(struct iwl_op_mode *op_mode,
 					  enum iwl_fw_ini_time_point tp_id,
 					  union iwl_dbg_tlv_tp_data *tp_data)
 {
+	if (!op_mode || !op_mode->ops || !op_mode->ops->time_point)
+		return;
 	op_mode->ops->time_point(op_mode, tp_id, tp_data);
 }
 
-- 
2.26.2


^ permalink raw reply related	[flat|nested] 5+ messages in thread