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

Commit 896cf561 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Greg Kroah-Hartman
Browse files

iwlwifi: pcie: add a NULL check in iwl_pcie_txq_unmap 



[ Upstream commit 98c7d21f957b10d9c07a3a60a3a5a8f326a197e5 ]

I hit a NULL pointer exception in this function when the
init flow went really bad.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/iwlwifi.20210115130252.2e8da9f2c132.I0234d4b8ddaf70aaa5028a20c863255e05bc1f84@changeid


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent dc64ebad

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

+5 −0
Original line number Diff line number Diff line
@@ -631,6 +631,11 @@ static void iwl_pcie_txq_unmap(struct iwl_trans *trans, int txq_id) 
	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	struct iwl_txq *txq = trans_pcie->txq[txq_id];



	if (!txq) {

		IWL_ERR(trans, "Trying to free a queue that wasn't allocated?\n");

		return;

	}



	spin_lock_bh(&txq->lock);

	while (txq->write_ptr != txq->read_ptr) {

		IWL_DEBUG_TX_REPLY(trans, "Q %d Free %d\n",