]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: iwlwifi: fix EWRD table validity check
authorMiri Korenblit <miriam.rachel.korenblit@intel.com>
Mon, 29 Jan 2024 19:21:49 +0000 (21:21 +0200)
committerSasha Levin <sashal@kernel.org>
Tue, 26 Mar 2024 22:21:50 +0000 (18:21 -0400)
[ Upstream commit c8d8f3911135921ace8e939ea0956b55f74bf8a0 ]

EWRD ACPI table contains up to 3 additional sar profiles.
According to the BIOS spec, the table contains a n_profile
variable indicating how many additional profiles exist in the
table.
Currently we check that n_profiles is not <= 0.
But according to the BIOS spec, 0 is a valid value,
and it can't be < 0 anyway because we receive that from ACPI as
an unsigned integer.

Fixes: 39c1a9728f93 ("iwlwifi: refactor the SAR tables from mvm to acpi")
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Reviewed-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://msgid.link/20240129211905.448ea2f40814.Iffd2aadf8e8693e6cb599bee0406a800a0c1e081@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/intel/iwlwifi/fw/acpi.c

index 5e4faf9ce4bbef9a22b3c10881a82d935835dc9f..fc35f8f84376cd1389aad21fcecf681db6d87c75 100644 (file)
@@ -555,7 +555,7 @@ int iwl_sar_get_ewrd_table(struct iwl_fw_runtime *fwrt)
         * from index 1, so the maximum value allowed here is
         * ACPI_SAR_PROFILES_NUM - 1.
         */
-       if (n_profiles <= 0 || n_profiles >= ACPI_SAR_PROFILE_NUM) {
+       if (n_profiles >= ACPI_SAR_PROFILE_NUM) {
                ret = -EINVAL;
                goto out_free;
        }