iwlwifi: mvm: make sure FW contains the right amount of paging sections

Paging contains 3 sections in the fw. The first for the paging separator,
The second for the CSS block, the third with the paging data.

Currently if the driver finds the paging separator, and there is only
section left (CSS), once reading the CSS section, the driver will
attempt to read the paging data and will go out of the arrays bounds.

Make sure that the FW image contains the right amount of sections for
paging.

Signed-off-by: Matti Gottlieb <matti.gottlieb@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index ebbadcf41ea051cb1b927901a68e281138988a73..766c262500d25e6362fa392519abba4a82a3db1f 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -174,8 +174,12 @@ static int iwl_fill_paging_mem(struct iwl_mvm *mvm, const struct fw_img *image)
                }
        }
 
-       if (sec_idx >= IWL_UCODE_SECTION_MAX) {
-               IWL_ERR(mvm, "driver didn't find paging image\n");
+       /*
+        * If paging is enabled there should be at least 2 more sections left
+        * (one for CSS and one for Paging data)
+        */
+       if (sec_idx >= ARRAY_SIZE(image->sec) - 1) {
+               IWL_ERR(mvm, "Paging: Missing CSS and/or paging sections\n");
                iwl_free_fw_paging(mvm);
                return -EINVAL;
        }