Commit ba3224db authored Jul 22, 2019 by Emmanuel Grumbach Committed by Johannes Berg Jul 30, 2019

iwlwifi: mvm: fix an out-of-bound access



The index for the elements of the ACPI object we dereference
was static. This means that if we called the function twice
we wouldn't start from 3 again, but rather from the latest
index we reached in the previous call.
This was dutifully reported by KASAN.

Fix this.

Cc: stable@vger.kernel.org
Fixes: 69964905 ("iwlwifi: mvm: add support for EWRD (Dynamic SAR) ACPI table")
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 87e7e25a

drivers/net/wireless/intel/iwlwifi/mvm/fw.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -755,7 +755,7 @@ static int iwl_mvm_sar_get_ewrd_table(struct iwl_mvm *mvm)

		for (i = 0; i < n_profiles; i++) {
		/* the tables start at element 3 */
		static int pos = 3;
		int pos = 3;

		/* The EWRD profiles officially go from 2 to 4, but we
		* save them in sar_profiles[1-3] (because we don't