From b34eef809d474d82f4c37c4d6ebdf6f7f2be9f44 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 12 Oct 2011 11:10:37 +0300 Subject: [PATCH] --- yaml --- r: 266764 b: refs/heads/master c: f9a703e173849425079e29e63bf960c2625e0a85 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwmc3200wifi/cfg80211.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f6f98e21d77f..569f1dcdb415 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d83579e2a50ac68389e6b4c58b845c702cf37516 +refs/heads/master: f9a703e173849425079e29e63bf960c2625e0a85 diff --git a/trunk/drivers/net/wireless/iwmc3200wifi/cfg80211.c b/trunk/drivers/net/wireless/iwmc3200wifi/cfg80211.c index ed57e4402800..c42be81e979e 100644 --- a/trunk/drivers/net/wireless/iwmc3200wifi/cfg80211.c +++ b/trunk/drivers/net/wireless/iwmc3200wifi/cfg80211.c @@ -187,13 +187,17 @@ static int iwm_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev, struct key_params*)) { struct iwm_priv *iwm = ndev_to_iwm(ndev); - struct iwm_key *key = &iwm->keys[key_index]; + struct iwm_key *key; struct key_params params; IWM_DBG_WEXT(iwm, DBG, "Getting key %d\n", key_index); + if (key_index >= IWM_NUM_KEYS) + return -ENOENT; + memset(¶ms, 0, sizeof(params)); + key = &iwm->keys[key_index]; params.cipher = key->cipher; params.key_len = key->key_len; params.seq_len = key->seq_len;