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

Commit a2b76b3b authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlwifi: fix bugs in change_interface 



If change_interface gets invoked during a firmware
restart, it may crash; prevent that from happening
by checking if ctx->vif is assigned.

Additionally, in my initial commit I forgot to set
the vif->p2p variable correctly, so fix that too.

Cc: stable@kernel.org [2.6.38+]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 68b99311

drivers/net/wireless/iwlwifi/iwl-core.c

+10 −0
Original line number Diff line number Diff line
@@ -1775,6 +1775,15 @@ int iwl_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 


	mutex_lock(&priv->mutex);



	if (!ctx->vif || !iwl_is_ready_rf(priv)) {

		/*

		 * Huh? But wait ... this can maybe happen when

		 * we're in the middle of a firmware restart!

		 */

		err = -EBUSY;

		goto out;

	}



	interface_modes = ctx->interface_modes | ctx->exclusive_interface_modes;



	if (!(interface_modes & BIT(newtype))) {
@@ -1802,6 +1811,7 @@ int iwl_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	/* success */

	iwl_teardown_interface(priv, vif, true);

	vif->type = newtype;

	vif->p2p = newp2p;

	err = iwl_setup_interface(priv, ctx);

	WARN_ON(err);

	/*