iwlwifi: pnvm: increment the pointer before checking the TLV

[ Upstream commit ff11a8ee2d2d0f78514ac9b42fb50c525ca695c7 ]

If the SKU_ID doesn't match, we don't increment the pointer and keep
checking the same TLV over and over again.

We need to increment the pointer in all situtations, namely if the TLV
is not a SKU_ID, if the SKU_ID matched or if the SKU_ID didn't match.
So we can increment the pointer already before checking for these
conditions to solve the problem.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Fixes: 6972592850c0 ("iwlwifi: read and parse PNVM file")
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210210172142.de94d366f3ff.I9a5a54906cf0f4ec8af981d6066bfd771152ffb9@changeid
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/pnvm.c b/drivers/net/wireless/intel/iwlwifi/fw/pnvm.c
index 1e16f83..37ce4fe 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/pnvm.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/pnvm.c
@@ -198,14 +198,14 @@ static int iwl_pnvm_parse(struct iwl_trans *trans, const u8 *data,
                                     le32_to_cpu(sku_id->data[1]),
                                     le32_to_cpu(sku_id->data[2]));
 
+                       data += sizeof(*tlv) + ALIGN(tlv_len, 4);
+                       len -= ALIGN(tlv_len, 4);
+
                        if (trans->sku_id[0] == le32_to_cpu(sku_id->data[0]) &&
                            trans->sku_id[1] == le32_to_cpu(sku_id->data[1]) &&
                            trans->sku_id[2] == le32_to_cpu(sku_id->data[2])) {
                                int ret;
 
-                               data += sizeof(*tlv) + ALIGN(tlv_len, 4);
-                               len -= ALIGN(tlv_len, 4);
-
                                ret = iwl_pnvm_handle_section(trans, data, len);
                                if (!ret)
                                        return 0;