linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
To: linux-wireless@vger.kernel.org
Cc: Eliad Peller <eliad@wizery.com>,
	Eliad Peller <eliadx.peller@intel.com>,
	Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Subject: [PATCH 10/45] iwlwifi: mvm: check iwl_mvm_wowlan_config_key_params() return value
Date: Mon, 21 Dec 2015 22:50:11 +0200	[thread overview]
Message-ID: <1450731046-2796-10-git-send-email-emmanuel.grumbach@intel.com> (raw)
In-Reply-To: <0BA3FCBA62E2DC44AF3030971E174FB32E949792@hasmsx107.ger.corp.intel.com>

From: Eliad Peller <eliad@wizery.com>

commit 9a4c830007817e ("iwlwifi: mvm: refactor d3 key
update functions") refactored some code into
iwl_mvm_wowlan_config_key_params() function, but the
return value was never checked, and not all the function
flows returned valid values. fix it.

Fixes: ac8ef0ce38de ("iwlwifi: mvm: refactor d3 key update functions")
Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
 drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
index 9e51843..542de74 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
@@ -917,6 +917,7 @@ int iwl_mvm_wowlan_config_key_params(struct iwl_mvm *mvm,
 		if (ret)
 			goto out;
 	}
+	ret = 0;
 out:
 	kfree(key_data.rsc_tsc);
 	return ret;
@@ -946,8 +947,11 @@ iwl_mvm_wowlan_config(struct iwl_mvm *mvm,
 		 * that isn't really a problem though.
 		 */
 		mutex_unlock(&mvm->mutex);
-		iwl_mvm_wowlan_config_key_params(mvm, vif, true, CMD_ASYNC);
+		ret = iwl_mvm_wowlan_config_key_params(mvm, vif, true,
+						       CMD_ASYNC);
 		mutex_lock(&mvm->mutex);
+		if (ret)
+			return ret;
 	}
 
 	ret = iwl_mvm_send_cmd_pdu(mvm, WOWLAN_CONFIGURATION, 0,
-- 
2.5.0


  parent reply	other threads:[~2015-12-21 20:51 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-21 20:48 pull request: iwlwifi-next-2015-12-21 Grumbach, Emmanuel
2015-12-21 20:50 ` [PATCH 01/45] iwlwifi: mvm: don't keep an mvm ref when the interface is down Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 02/45] iwlwifi: mvm: add an option to start rs from HT/VHT rates Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 03/45] iwlwifi: mvm: set default new STA as non-aggregated Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 04/45] iwlwifi: mvm: configure scheduled scan according to traffic conditions Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 05/45] iwlwifi: mvm: rs: fix a potential out of bounds access Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 06/45] iwlwifi: mvm: advertise NETIF_F_SG Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 07/45] iwlwifi: dvm: " Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 08/45] iwlwifi: mvm: remove an extra tab Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 09/45] iwlwifi: mvm: cleanup roc te on restart cleanup Emmanuel Grumbach
2015-12-21 20:50 ` Emmanuel Grumbach [this message]
2015-12-21 20:50 ` [PATCH 11/45] iwlwifi: pcie: allow the op_mode to block the tx queues Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 12/45] iwlwifi: trans: support a callback for ASYNC commands Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 13/45] iwlwifi: block the queues when we send ADD_STA for uAPSD Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 14/45] iwlwifi: uninline iwl_trans_send_cmd Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 15/45] iwlwifi: update host command messages to new format Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 16/45] iwlwifi: mvm: close the SP if we send fewer frames than expected in SP Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 17/45] iwlwifi: avoid d0i3 commands when no/init ucode is loaded Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 18/45] iwlwifi: mvm: remove the vif parameter of iwl_mvm_configure_bcast_filter() Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 19/45] iwlwifi: replace d0i3_mode and wowlan_d0i3 with more generic variables Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 20/45] iwlwifi: expose fw usniffer mode to more utilities Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 21/45] iwlwifi: mvm: change protocol offload flows Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 22/45] iwlwifi: dvm: fix compare_const_fl.cocci warnings Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 23/45] iwlwifi: change the Intel Wireless email address Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 24/45] iwlwifi: pcie: allow to pretend to have Tx CSUM for debug Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 25/45] iwlwifi: mvm: prepare the code towards TSO implementation Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 26/45] iwlwifi: pcie: re-organize code towards TSO Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 27/45] iwlwifi: clear ieee80211_tx_info->driver_data in the op_mode Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 28/45] iwlwifi: pcie: build an A-MSDU using TSO core Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 29/45] iwlwifi: 9000: increase the number of queues Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 30/45] iwlwifi: mvm: refactor the way fw_key_table is handled Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 31/45] iwlwifi: mvm: enable L3 filtering Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 32/45] iwlwifi: mvm: support description for user triggered fw dbg collection Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 33/45] iwlwifi: mvm: small update in the firmware API Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 34/45] iwlwifi: mvm: add extended dwell time Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 35/45] iwlwifi: mvm: Add a station in monitor mode Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 36/45] iwlwifi: mvm: change iwl_mvm_get_key_sta_id() to return the station Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 37/45] iwlwifi: mvm: add 9000 series RX processing Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 38/45] iwlwifi: mvm: infrastructure for frame-release message Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 39/45] iwlwifi: mvm: dump more registers upon error Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 40/45] iwlwifi: Update PCI IDs for 8000 and 9000 series Emmanuel Grumbach
2015-12-29 16:06   ` Kalle Valo
2015-12-21 20:50 ` [PATCH 41/45] iwlwifi: mvm: Change number of associated stations when station becomes associated Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 42/45] iwlwifi: update key params on d0i3 entrance/exit Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 43/45] iwlwifi: remove unused parameter from grab_nic_access Emmanuel Grumbach
2015-12-21 20:50 ` [PATCH 44/45] iwlwifi: fix printf specifier Emmanuel Grumbach
2015-12-23  4:08   ` Joe Perches
2015-12-23  6:28     ` Grumbach, Emmanuel
2015-12-21 20:50 ` [PATCH 45/45] iwlwifi: bail out in case of bad trans state Emmanuel Grumbach
2015-12-21 20:54 ` pull request: iwlwifi-next-2015-12-21 Grumbach, Emmanuel
2015-12-29 16:47 ` Kalle Valo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1450731046-2796-10-git-send-email-emmanuel.grumbach@intel.com \
    --to=emmanuel.grumbach@intel.com \
    --cc=eliad@wizery.com \
    --cc=eliadx.peller@intel.com \
    --cc=linux-wireless@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).