Commit fb3c06cf authored by Luca Coelho's avatar Luca Coelho

iwlwifi: fw: make pos static in iwl_sar_get_ewrd_table() loop

In the for loop where we are supposed to go through the entire table,
we are using a non-static local to keep the pos index.  This makes
each iteration start with 3, so we always access the first item on the
table.  Fix this by moving the variable outside of the loo so it
doesn't lose its value at every iteration.
Reported-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Fixes: ba3224db ("iwlwifi: mvm: fix an out-of-bound access")
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent f06021a1
...@@ -357,8 +357,8 @@ int iwl_sar_get_ewrd_table(struct iwl_fw_runtime *fwrt) ...@@ -357,8 +357,8 @@ int iwl_sar_get_ewrd_table(struct iwl_fw_runtime *fwrt)
{ {
union acpi_object *wifi_pkg, *data; union acpi_object *wifi_pkg, *data;
bool enabled; bool enabled;
int i, n_profiles, tbl_rev; int i, n_profiles, tbl_rev, pos;
int ret = 0; int ret = 0;
data = iwl_acpi_get_object(fwrt->dev, ACPI_EWRD_METHOD); data = iwl_acpi_get_object(fwrt->dev, ACPI_EWRD_METHOD);
if (IS_ERR(data)) if (IS_ERR(data))
...@@ -390,10 +390,10 @@ int iwl_sar_get_ewrd_table(struct iwl_fw_runtime *fwrt) ...@@ -390,10 +390,10 @@ int iwl_sar_get_ewrd_table(struct iwl_fw_runtime *fwrt)
goto out_free; goto out_free;
} }
for (i = 0; i < n_profiles; i++) { /* the tables start at element 3 */
/* the tables start at element 3 */ pos = 3;
int pos = 3;
for (i = 0; i < n_profiles; i++) {
/* The EWRD profiles officially go from 2 to 4, but we /* The EWRD profiles officially go from 2 to 4, but we
* save them in sar_profiles[1-3] (because we don't * save them in sar_profiles[1-3] (because we don't
* have profile 0). So in the array we start from 1. * have profile 0). So in the array we start from 1.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment