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

Commit e5629be7 authored by Eliad Peller's avatar Eliad Peller Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: avoid use-after-free on iwl_mvm_d0i3_enable_tx() [BUGFIX] 



qos_seq points (to a struct) inside the command response data.

Make sure to free the response only after qos_seq is not
needed anymore.

type=bugfix
bug=not-tracked
fixes=I78c07110b59dcd389207bd2b168b0a2760839fe0

Change-Id: I619ce2c17e064dc98c7be9abc1e23175fdc8fb9a
Reported-by: default avatarHeng Luo <heng.luo@intel.com>
Signed-off-by: default avatarEliad Peller <eliadx.peller@intel.com>
Reviewed-on: https://gerrit.rds.intel.com/r/55381


Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tested-by: IWL Jenkins
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 8423cdc3

drivers/net/wireless/iwlwifi/mvm/ops.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -1263,11 +1263,13 @@ static void iwl_mvm_d0i3_exit_work(struct work_struct *wk) 
		ieee80211_iterate_active_interfaces(

		ieee80211_iterate_active_interfaces(

			mvm->hw, IEEE80211_IFACE_ITER_NORMAL,

			mvm->hw, IEEE80211_IFACE_ITER_NORMAL,

			iwl_mvm_d0i3_disconnect_iter, mvm);

			iwl_mvm_d0i3_disconnect_iter, mvm);



	iwl_free_resp(&get_status_cmd);

out:

out:

	iwl_mvm_d0i3_enable_tx(mvm, qos_seq);

	iwl_mvm_d0i3_enable_tx(mvm, qos_seq);





	/* qos_seq might point inside resp_pkt, so free it only now */

	if (get_status_cmd.resp_pkt)

		iwl_free_resp(&get_status_cmd);



	/* the FW might have updated the regdomain */

	/* the FW might have updated the regdomain */

	iwl_mvm_update_changed_regdom(mvm);

	iwl_mvm_update_changed_regdom(mvm);