iwmc3200wifi: add some more range checks

My previous patch added a check to get_key() but missed a couple
other places which need range checks.

The problem here is that wifi drivers have different numbers of keys.
The lower levels assume that they can have up to 4 default keys and
2 management keys but this driver only has the default keys so we
could go past the end of the ->keys[] array.

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>

1 files changed, 13 insertions, 2 deletions

diff --git a/drivers/net/wireless/iwmc3200wifi/cfg80211.c b/drivers/net/wireless/iwmc3200wifi/cfg80211.c
index c42be81e979e..48e8218fd23b 100644
--- a/drivers/net/wireless/iwmc3200wifi/cfg80211.c
+++ b/drivers/net/wireless/iwmc3200wifi/cfg80211.c
@@ -165,11 +165,15 @@ static int iwm_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,
                                 struct key_params *params)
 {
         struct iwm_priv *iwm = ndev_to_iwm(ndev);
-        struct iwm_key *key = &iwm->keys[key_index];
+        struct iwm_key *key;
         int ret;
 
         IWM_DBG_WEXT(iwm, DBG, "Adding key for %pM\n", mac_addr);
 
+        if (key_index >= IWM_NUM_KEYS)
+                return -ENOENT;
+
+        key = &iwm->keys[key_index];
         memset(key, 0, sizeof(struct iwm_key));
         ret = iwm_key_init(key, key_index, mac_addr, params);
         if (ret < 0) {
@@ -214,8 +218,12 @@ static int iwm_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev,
                                 u8 key_index, bool pairwise, const u8 *mac_addr)
 {
         struct iwm_priv *iwm = ndev_to_iwm(ndev);
-        struct iwm_key *key = &iwm->keys[key_index];
+        struct iwm_key *key;
 
+        if (key_index >= IWM_NUM_KEYS)
+                return -ENOENT;
+
+        key = &iwm->keys[key_index];
         if (!iwm->keys[key_index].key_len) {
                 IWM_DBG_WEXT(iwm, DBG, "Key %d not used\n", key_index);
                 return 0;
@@ -236,6 +244,9 @@ static int iwm_cfg80211_set_default_key(struct wiphy *wiphy,
 
         IWM_DBG_WEXT(iwm, DBG, "Default key index is: %d\n", key_index);
 
+        if (key_index >= IWM_NUM_KEYS)
+                return -ENOENT;
+
         if (!iwm->keys[key_index].key_len) {
                 IWM_ERR(iwm, "Key %d not used\n", key_index);
                 return -EINVAL;