2 files changed, 3 insertions, 1 deletions

diff --git a/net/wireless/core.c b/net/wireless/core.c
index 9698fe709251..55ec9be9feb7 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -1007,7 +1007,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
                         rdev->devlist_generation++;
                         cfg80211_mlme_purge_registrations(wdev);
 #ifdef CONFIG_CFG80211_WEXT
-                        kfree(wdev->wext.keys);
+                        kzfree(wdev->wext.keys);
 #endif
                 }
                 /*
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index 11120bb14162..0f47948c572f 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -496,6 +496,8 @@ static int __cfg80211_set_encryption(struct cfg80211_registered_device *rdev,
                         err = 0;
                 if (!err) {
                         if (!addr) {
+                                memset(wdev->wext.keys->data[idx], 0,
+                                       sizeof(wdev->wext.keys->data[idx]));
                                 wdev->wext.keys->params[idx].key_len = 0;
                                 wdev->wext.keys->params[idx].cipher = 0;
                         }