linux-kernel - linux-next: manual merge of the iwlwifi-next tree with the net tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250903121032.744f5a30@canb.auug.org.au>
Date: Wed, 3 Sep 2025 12:10:32 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Miriam Rachel Korenblit <miriam.rachel.korenblit@...el.com>, Johannes
 Berg <johannes@...solutions.net>, David Miller <davem@...emloft.net>, Jakub
 Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>
Cc: Johannes Berg <johannes.berg@...el.com>, Networking
 <netdev@...r.kernel.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the iwlwifi-next tree with the net tree

Hi all,

Today's linux-next merge of the iwlwifi-next tree got a conflict in:

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

between commit:

  1d33694462fa ("wifi: iwlwifi: uefi: check DSM item validity")

from the net tree and commit:

  f53f2bd8fc5f ("wifi: iwlwifi: uefi: remove runtime check of constant values")

from the iwlwifi-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/wireless/intel/iwlwifi/fw/uefi.c
index 99a17b9323e9,44c7c565d1c6..000000000000
--- a/drivers/net/wireless/intel/iwlwifi/fw/uefi.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/uefi.c
@@@ -742,17 -744,6 +744,12 @@@ int iwl_uefi_get_dsm(struct iwl_fw_runt
  		goto out;
  	}
  
- 	if (ARRAY_SIZE(data->functions) != UEFI_MAX_DSM_FUNCS) {
- 		IWL_DEBUG_RADIO(fwrt, "Invalid size of DSM functions array\n");
- 		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,

Content of type "application/pgp-signature" skipped