iwlwifi: mvm: check if mac80211_queue is valid in iwl_mvm_disable_txq

[ Upstream commit 9a233bb8025105db9a60b5d761005cc5a6c77f3d ]

Sometimes iwl_mvm_disable_txq() may be called with mac80211_queue ==
IEEE80211_INVAL_HW_QUEUE, and this would cause us to use BIT(0xFF)
which is way too large for the u16 we used to store it in
hw_queue_to_mac820211.  If this happens the following UBSAN warning
will be generated:

[  167.185167] UBSAN: Undefined behaviour in drivers/net/wireless/intel/iwlwifi/mvm/utils.c:838:5
[  167.185171] shift exponent 255 is too large for 64-bit type 'long unsigned int'

Fix that by checking that it is not IEEE80211_INVAL_HW_QUEUE and,
while at it, add a warning if the queue number is larger than
IEEE80211_MAX_QUEUES.

Fixes: 34e10860ae8d ("iwlwifi: mvm: remove references to queue_info in new TX path")
Reported-by: Paul Menzel <pmenzel+linux-wireless@molgen.mpg.de>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
index 43ab172d31cb17e50decf14eb8740b46b9b7add4..d2cada0ab426455e810d864a114c748e0400d195 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
@@ -810,12 +810,19 @@ int iwl_mvm_disable_txq(struct iwl_mvm *mvm, int queue, int mac80211_queue,
                .scd_queue = queue,
                .action = SCD_CFG_DISABLE_QUEUE,
        };
-       bool remove_mac_queue = true;
+       bool remove_mac_queue = mac80211_queue != IEEE80211_INVAL_HW_QUEUE;
        int ret;
 
+       if (WARN_ON(remove_mac_queue && mac80211_queue >= IEEE80211_MAX_QUEUES))
+               return -EINVAL;
+
        if (iwl_mvm_has_new_tx_api(mvm)) {
                spin_lock_bh(&mvm->queue_info_lock);
-               mvm->hw_queue_to_mac80211[queue] &= ~BIT(mac80211_queue);
+
+               if (remove_mac_queue)
+                       mvm->hw_queue_to_mac80211[queue] &=
+                               ~BIT(mac80211_queue);
+
                spin_unlock_bh(&mvm->queue_info_lock);
 
                iwl_trans_txq_free(mvm->trans, queue);