diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2016-09-13 16:39:38 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2016-09-13 20:20:54 +0200 |
| commit | 89b706fb28e431fa7639348536c284fb375eb3c0 (patch) | |
| tree | 06fdb3e6e1f5f6cc573fc17b3732df8579dfb61d /net/wireless/wext-compat.c | |
| parent | cfg80211: validate key index better (diff) | |
| download | linux-dev-89b706fb28e431fa7639348536c284fb375eb3c0.tar.xz linux-dev-89b706fb28e431fa7639348536c284fb375eb3c0.zip | |
cfg80211: reduce connect key caching struct size
After the previous patches, connect keys can only (correctly)
be used for storing static WEP keys. Therefore, remove all the
data for dealing with key index 4/5 and reduce the size of the
key material to the maximum for WEP keys.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/wext-compat.c')
| -rw-r--r-- | net/wireless/wext-compat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c index e45a76449b43..7b97d43b27e1 100644 --- a/net/wireless/wext-compat.c +++ b/net/wireless/wext-compat.c @@ -408,10 +408,10 @@ static int __cfg80211_set_encryption(struct cfg80211_registered_device *rdev, if (!wdev->wext.keys) { wdev->wext.keys = kzalloc(sizeof(*wdev->wext.keys), - GFP_KERNEL); + GFP_KERNEL); if (!wdev->wext.keys) return -ENOMEM; - for (i = 0; i < 6; i++) + for (i = 0; i < 4; i++) wdev->wext.keys->params[i].key = wdev->wext.keys->data[i]; } @@ -460,7 +460,7 @@ static int __cfg80211_set_encryption(struct cfg80211_registered_device *rdev, if (err == -ENOENT) err = 0; if (!err) { - if (!addr) { + if (!addr && idx < 4) { memset(wdev->wext.keys->data[idx], 0, sizeof(wdev->wext.keys->data[idx])); wdev->wext.keys->params[idx].key_len = 0; |