summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-05-08 13:55:31 (GMT)
committerJohannes Berg <johannes.berg@intel.com>2013-05-14 08:42:55 (GMT)
commite28210115b0ff3544b39ee67d8e48dc74b25b6b8 (patch)
tree0e400b7a4006871f551084b9c6decc50b555dc26
parentafc66bb734d44ea64cc78ae8d8034886e8cfb2c7 (diff)
downloadlinux-e28210115b0ff3544b39ee67d8e48dc74b25b6b8.tar.xz
iwlwifi: mvm: sanity check context in iwl_mvm_phy_ctxt_unref()
In some botched (!) restart scenarios we seem to get here with a NULL PHY context, so warn and exit instead of crashing. Reported-by: Omer Kremer <omerx.kremer@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com> Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c b/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
index 0ea61aa..1b4db25 100644
--- a/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
+++ b/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
@@ -245,5 +245,9 @@ int iwl_mvm_phy_ctxt_changed(struct iwl_mvm *mvm, struct iwl_mvm_phy_ctxt *ctxt,
void iwl_mvm_phy_ctxt_unref(struct iwl_mvm *mvm, struct iwl_mvm_phy_ctxt *ctxt)
{
lockdep_assert_held(&mvm->mutex);
+
+ if (WARN_ON_ONCE(!ctxt))
+ return;
+
ctxt->ref--;
}