wifi: iwlwifi: uefi: check DSM item validity
authorJohannes Berg <johannes.berg@intel.com>
Thu, 28 Aug 2025 06:55:28 +0000 (09:55 +0300)
committerMiri Korenblit <miriam.rachel.korenblit@intel.com>
Thu, 28 Aug 2025 11:00:45 +0000 (14:00 +0300)
The first array index is a bitmap indicating which of the
other values are valid. Check that bitmap before returning
a value.

Fixes: fc7214c3c986 ("wifi: iwlwifi: read DSM functions from UEFI")
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=220085
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250828095500.59ec52ff865e.I9e11f497a029eb38f481b2c90c43c0935285216d@changeid
drivers/net/wireless/intel/iwlwifi/fw/uefi.c

index 48126ec6b94bfd6d0dac79389ee73f4f5667e8c1..99a17b9323e9b796c077dcc90d5cc11c1874f63e 100644 (file)
@@ -747,6 +747,12 @@ int iwl_uefi_get_dsm(struct iwl_fw_runtime *fwrt, enum iwl_dsm_funcs func,
                goto out;
        }
 
+       if (!(data->functions[DSM_FUNC_QUERY] & BIT(func))) {
+               IWL_DEBUG_RADIO(fwrt, "DSM func %d not in 0x%x\n",
+                               func, data->functions[DSM_FUNC_QUERY]);
+               goto out;
+       }
+
        *value = data->functions[func];
 
        IWL_DEBUG_RADIO(fwrt,