wifi: iwlwifi: fw: don't always use FW dump trig

commit 045a5b645dd59929b0e05375f493cde3a0318271 upstream.

Since the dump_data (struct iwl_fwrt_dump_data) is a union,
it's not safe to unconditionally access and use the 'trig'
member, it might be 'desc' instead. Access it only if it's
known to be 'trig' rather than 'desc', i.e. if ini-debug
is present.

Cc: stable@vger.kernel.org
Fixes: 0eb50c674a1e ("iwlwifi: yoyo: send hcmd to fw after dump collection completes.")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240319100755.e2976bc58b29.I72fbd6135b3623227de53d8a2bb82776066cb72b@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
index 3975a53a9f2099a4aaf42e0488e605cf79df6b50..57ddd8aefa42bb00c2137efc7d78873ac82710f3 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
@@ -3075,8 +3075,6 @@ static void iwl_fw_dbg_collect_sync(struct iwl_fw_runtime *fwrt, u8 wk_idx)
        struct iwl_fw_dbg_params params = {0};
        struct iwl_fwrt_dump_data *dump_data =
                &fwrt->dump.wks[wk_idx].dump_data;
-       u32 policy;
-       u32 time_point;
        if (!test_bit(wk_idx, &fwrt->dump.active_wks))
                return;
 
@@ -3107,13 +3105,16 @@ static void iwl_fw_dbg_collect_sync(struct iwl_fw_runtime *fwrt, u8 wk_idx)
 
        iwl_fw_dbg_stop_restart_recording(fwrt, &params, false);
 
-       policy = le32_to_cpu(dump_data->trig->apply_policy);
-       time_point = le32_to_cpu(dump_data->trig->time_point);
+       if (iwl_trans_dbg_ini_valid(fwrt->trans)) {
+               u32 policy = le32_to_cpu(dump_data->trig->apply_policy);
+               u32 time_point = le32_to_cpu(dump_data->trig->time_point);
 
-       if (policy & IWL_FW_INI_APPLY_POLICY_DUMP_COMPLETE_CMD) {
-               IWL_DEBUG_FW_INFO(fwrt, "WRT: sending dump complete\n");
-               iwl_send_dbg_dump_complete_cmd(fwrt, time_point, 0);
+               if (policy & IWL_FW_INI_APPLY_POLICY_DUMP_COMPLETE_CMD) {
+                       IWL_DEBUG_FW_INFO(fwrt, "WRT: sending dump complete\n");
+                       iwl_send_dbg_dump_complete_cmd(fwrt, time_point, 0);
+               }
        }
+
        if (fwrt->trans->dbg.last_tp_resetfw == IWL_FW_INI_RESET_FW_MODE_STOP_FW_ONLY)
                iwl_force_nmi(fwrt->trans);