From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
To: linux-wireless@vger.kernel.org
Cc: Matti Gottlieb <matti.gottlieb@intel.com>,
Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Subject: [PATCH 02/10] iwlwifi: mvm: Avoid accessing Null pointer when setting igtk
Date: Sun, 12 Jul 2015 20:08:12 +0300 [thread overview]
Message-ID: <1436720900-18588-2-git-send-email-emmanuel.grumbach@intel.com> (raw)
In-Reply-To: <1436720814.17999.2.camel@intel.com>
From: Matti Gottlieb <matti.gottlieb@intel.com>
Sometimes when setting an igtk key the station maybe NULL.
In the of case igtk the function will skip to the end, and
try to print sta->addr, if sta is Null - we will access a
Null pointer.
Avoid accessing a Null pointer when setting a igtk key &
the sta == NULL, and print a default MAC address instead.
Signed-off-by: Matti Gottlieb <matti.gottlieb@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/mvm/sta.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/iwlwifi/mvm/sta.c b/drivers/net/wireless/iwlwifi/mvm/sta.c
index d68dc69..26f076e 100644
--- a/drivers/net/wireless/iwlwifi/mvm/sta.c
+++ b/drivers/net/wireless/iwlwifi/mvm/sta.c
@@ -1401,6 +1401,7 @@ int iwl_mvm_set_sta_key(struct iwl_mvm *mvm,
bool mcast = !(keyconf->flags & IEEE80211_KEY_FLAG_PAIRWISE);
u8 sta_id;
int ret;
+ static const u8 __maybe_unused zero_addr[ETH_ALEN] = {0};
lockdep_assert_held(&mvm->mutex);
@@ -1467,7 +1468,7 @@ int iwl_mvm_set_sta_key(struct iwl_mvm *mvm,
end:
IWL_DEBUG_WEP(mvm, "key: cipher=%x len=%d idx=%d sta=%pM ret=%d\n",
keyconf->cipher, keyconf->keylen, keyconf->keyidx,
- sta->addr, ret);
+ sta ? sta->addr : zero_addr, ret);
return ret;
}
--
2.1.4
next prev parent reply other threads:[~2015-07-12 17:08 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-12 17:06 pull request: iwlwifi 2015-06-15 Grumbach, Emmanuel
2015-07-12 17:08 ` [PATCH 01/10] iwlwifi: mvm: fix antenna selection when BT is active Emmanuel Grumbach
2015-07-12 17:08 ` Emmanuel Grumbach [this message]
2015-07-12 17:08 ` [PATCH 03/10] iwlwifi: pcie: Fix bug in NIC's PM registers access Emmanuel Grumbach
2015-07-12 17:08 ` [PATCH 04/10] iwlwifi: pcie: don't panic if pcie transport alloc fails Emmanuel Grumbach
2015-07-12 17:08 ` [PATCH 05/10] iwlwifi: pcie: prepare the device before accessing it Emmanuel Grumbach
2015-07-12 17:08 ` [PATCH 06/10] iwlwifi: mvm: check time-event vif to avoid bad deletion Emmanuel Grumbach
2015-07-12 17:08 ` [PATCH 07/10] iwlwifi: edit the 3165 series and 8000 series PCI IDs Emmanuel Grumbach
2015-07-17 8:15 ` Kalle Valo
2015-07-12 17:08 ` [PATCH 08/10] iwlwifi: mvm: Add preemptive flag to scheulded scan Emmanuel Grumbach
2015-07-12 17:08 ` [PATCH 09/10] Revert "iwlwifi: pcie: New RBD allocation model" Emmanuel Grumbach
2015-07-12 17:08 ` [PATCH 10/10] iwlwifi: nvm: remove mac address byte swapping in 8000 family Emmanuel Grumbach
2015-07-17 8:26 ` pull request: iwlwifi 2015-06-15 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=1436720900-18588-2-git-send-email-emmanuel.grumbach@intel.com \
--to=emmanuel.grumbach@intel.com \
--cc=linux-wireless@vger.kernel.org \
--cc=matti.gottlieb@intel.com \
/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).