Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af73fb33 authored by Johannes Berg's avatar Johannes Berg Committed by Greg Kroah-Hartman
Browse files

iwlwifi: pcie: don't crash on invalid RX interrupt 



[ Upstream commit 30f24eabab8cd801064c5c37589d803cb4341929 ]

If for some reason the device gives us an RX interrupt before we're
ready for it, perhaps during device power-on with misconfigured IRQ
causes mapping or so, we can crash trying to access the queues.

Prevent that by checking that we actually have RXQs and that they
were properly allocated.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 9375939f

drivers/net/wireless/intel/iwlwifi/pcie/rx.c

+6 −1
Original line number Diff line number Diff line
@@ -1225,10 +1225,15 @@ static void iwl_pcie_rx_handle_rb(struct iwl_trans *trans, 
static void iwl_pcie_rx_handle(struct iwl_trans *trans, int queue)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	struct iwl_rxq *rxq = &trans_pcie->rxq[queue];

	struct iwl_rxq *rxq;

	u32 r, i, count = 0;

	bool emergency = false;



	if (WARN_ON_ONCE(!trans_pcie->rxq || !trans_pcie->rxq[queue].bd))

		return;



	rxq = &trans_pcie->rxq[queue];



restart:

	spin_lock(&rxq->lock);

	/* uCode's read index (stored in shared DRAM) indicates the last Rx