LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] [v3] iwlwifi: pcie: fix constant-conversion warning
@ 2021-11-18 14:21 Arnd Bergmann
  2021-11-18 16:03 ` Nathan Chancellor
  2021-11-22 18:35 ` Kalle Valo
  0 siblings, 2 replies; 4+ messages in thread
From: Arnd Bergmann @ 2021-11-18 14:21 UTC (permalink / raw)
  To: Luca Coelho, Kalle Valo
  Cc: Arnd Bergmann, kernel test robot, Nick Desaulniers,
	David S. Miller, Jakub Kicinski, Nathan Chancellor,
	Johannes Berg, Yaara Baruch, Matti Gottlieb, Emmanuel Grumbach,
	linux-wireless, netdev, linux-kernel, llvm

From: Arnd Bergmann <arnd@arndb.de>

gcc-11 points out a potential issue with integer overflow when
the iwl_dev_info_table[] array is empty:

drivers/net/wireless/intel/iwlwifi/pcie/drv.c:1344:42: error: implicit conversion from 'unsigned long' to 'int' changes value from 18446744073709551615 to -1 [-Werror,-Wconstant-conversion]
        for (i = ARRAY_SIZE(iwl_dev_info_table) - 1; i >= 0; i--) {
               ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~

This is still harmless, as the loop correctly terminates, but adding
an extra range check makes that obvious to both readers and to the
compiler.

Fixes: 3f7320428fa4 ("iwlwifi: pcie: simplify iwl_pci_find_dev_info()")
Reported-by: kernel test robot <lkp@intel.com>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
Changes in v3:
- make it actually work with gcc-11
- fix commit message s/clang/gcc-11/

Changes in v2:
- replace int cast with a range check
---
 drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index c574f041f096..395e328c6a07 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -1339,9 +1339,13 @@ iwl_pci_find_dev_info(u16 device, u16 subsystem_device,
 		      u16 mac_type, u8 mac_step,
 		      u16 rf_type, u8 cdb, u8 rf_id, u8 no_160, u8 cores)
 {
+	int num_devices = ARRAY_SIZE(iwl_dev_info_table);
 	int i;
 
-	for (i = ARRAY_SIZE(iwl_dev_info_table) - 1; i >= 0; i--) {
+	if (!num_devices)
+		return NULL;
+
+	for (i = num_devices - 1; i >= 0; i--) {
 		const struct iwl_dev_info *dev_info = &iwl_dev_info_table[i];
 
 		if (dev_info->device != (u16)IWL_CFG_ANY &&
-- 
2.29.2


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-11-22 18:35 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-18 14:21 [PATCH] [v3] iwlwifi: pcie: fix constant-conversion warning Arnd Bergmann
2021-11-18 16:03 ` Nathan Chancellor
2021-11-18 16:27   ` Arnd Bergmann
2021-11-22 18:35 ` Kalle Valo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).