]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
iwlwifi: yoyo: Avoid using dram data if allocation failed
authorMukesh Sisodiya <mukesh.sisodiya@intel.com>
Fri, 4 Feb 2022 10:25:01 +0000 (12:25 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 Apr 2022 11:58:08 +0000 (13:58 +0200)
[ Upstream commit e2d53d10ef666859517360e711fd7761e7e984ce ]

The config set TLV setting depend on dram allocation
and if allocation failed the data used in config set tlv
should not set this.
Adding the check if dram fragment is available or not.

Signed-off-by: Mukesh Sisodiya <mukesh.sisodiya@intel.com>
Fixes: 1a5daead217c ("iwlwifi: yoyo: support for ROM usniffer")
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20220204122220.44835d181528.I3e78ba29c13bbeada017fcb2a620f3552c1dfa30@changeid
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c

index c73672d613562ac50cf7e2ec1c6a5924124f601b..42f6f8bb83be9c6547ce20f55f863d7cf77dc1e3 100644 (file)
@@ -861,11 +861,18 @@ static void iwl_dbg_tlv_apply_config(struct iwl_fw_runtime *fwrt,
                case IWL_FW_INI_CONFIG_SET_TYPE_DBGC_DRAM_ADDR: {
                        struct iwl_dbgc1_info dram_info = {};
                        struct iwl_dram_data *frags = &fwrt->trans->dbg.fw_mon_ini[1].frags[0];
-                       __le64 dram_base_addr = cpu_to_le64(frags->physical);
-                       __le32 dram_size = cpu_to_le32(frags->size);
-                       u64  dram_addr = le64_to_cpu(dram_base_addr);
+                       __le64 dram_base_addr;
+                       __le32 dram_size;
+                       u64 dram_addr;
                        u32 ret;
 
+                       if (!frags)
+                               break;
+
+                       dram_base_addr = cpu_to_le64(frags->physical);
+                       dram_size = cpu_to_le32(frags->size);
+                       dram_addr = le64_to_cpu(dram_base_addr);
+
                        IWL_DEBUG_FW(fwrt, "WRT: dram_base_addr 0x%016llx, dram_size 0x%x\n",
                                     dram_base_addr, dram_size);
                        IWL_DEBUG_FW(fwrt, "WRT: config_list->addr_offset: %u\n",