aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwmc3200wifi/cfg80211.c
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2011-10-12 04:10:37 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-10-14 14:48:15 -0400
commitf9a703e173849425079e29e63bf960c2625e0a85 (patch)
treebebb01202223540fb20f5e4593fc6f8453188331 /drivers/net/wireless/iwmc3200wifi/cfg80211.c
parentd83579e2a50ac68389e6b4c58b845c702cf37516 (diff)
iwmc3200wifi: add a range check to iwm_cfg80211_get_key()
Smatch complains that "key_index" is capped at 5 in nl80211_get_key() but iwm->keys[] only has 4 elements. I don't know if this is really needed, but the other ->get_key() implementations seemed to check for overflows so I've added a check here. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi/cfg80211.c')
-rw-r--r--drivers/net/wireless/iwmc3200wifi/cfg80211.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/cfg80211.c b/drivers/net/wireless/iwmc3200wifi/cfg80211.c
index ed57e440280..c42be81e979 100644
--- a/drivers/net/wireless/iwmc3200wifi/cfg80211.c
+++ b/drivers/net/wireless/iwmc3200wifi/cfg80211.c
@@ -187,13 +187,17 @@ static int iwm_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev,
187 struct key_params*)) 187 struct key_params*))
188{ 188{
189 struct iwm_priv *iwm = ndev_to_iwm(ndev); 189 struct iwm_priv *iwm = ndev_to_iwm(ndev);
190 struct iwm_key *key = &iwm->keys[key_index]; 190 struct iwm_key *key;
191 struct key_params params; 191 struct key_params params;
192 192
193 IWM_DBG_WEXT(iwm, DBG, "Getting key %d\n", key_index); 193 IWM_DBG_WEXT(iwm, DBG, "Getting key %d\n", key_index);
194 194
195 if (key_index >= IWM_NUM_KEYS)
196 return -ENOENT;
197
195 memset(&params, 0, sizeof(params)); 198 memset(&params, 0, sizeof(params));
196 199
200 key = &iwm->keys[key_index];
197 params.cipher = key->cipher; 201 params.cipher = key->cipher;
198 params.key_len = key->key_len; 202 params.key_len = key->key_len;
199 params.seq_len = key->seq_len; 203 params.seq_len = key->seq_len;