]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
wifi: iwlwifi: yoyo: Fix possible division by zero
authorDaniel Gabay <daniel.gabay@intel.com>
Thu, 13 Apr 2023 18:40:34 +0000 (21:40 +0300)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 7 Jul 2023 10:17:00 +0000 (12:17 +0200)
BugLink: https://bugs.launchpad.net/bugs/2025067
[ Upstream commit ba30415118eee374a08b39a0460a1d1e52c24a25 ]

Don't allow buffer allocation TLV with zero req_size since it
leads later to division by zero in iwl_dbg_tlv_alloc_fragments().
Also, NPK/SRAM locations are allowed to have zero buffer req_size,
don't discard them.

Fixes: a9248de42464 ("iwlwifi: dbg_ini: add TLV allocation new API support")
Signed-off-by: Daniel Gabay <daniel.gabay@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230413213309.5d6688ed74d8.I5c2f3a882b50698b708d54f4524dc5bdf11e3d32@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c

index 48e7376a5fea73d8a2e5981106b454165981167d..7ed4991f8dab99783570fb790eff8ca94bea7543 100644 (file)
@@ -138,6 +138,12 @@ static int iwl_dbg_tlv_alloc_buf_alloc(struct iwl_trans *trans,
            alloc_id != IWL_FW_INI_ALLOCATION_ID_DBGC1)
                goto err;
 
+       if (buf_location == IWL_FW_INI_LOCATION_DRAM_PATH &&
+           alloc->req_size == 0) {
+               IWL_ERR(trans, "WRT: Invalid DRAM buffer allocation requested size (0)\n");
+               return -EINVAL;
+       }
+
        trans->dbg.fw_mon_cfg[alloc_id] = *alloc;
 
        return 0;