Merge tag 'kselftest-3.18-updates-1' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / net / wireless / ibss.c

diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c
index 8f345da..e24fc58 100644 (file)
--- a/net/wireless/ibss.c
+++ b/net/wireless/ibss.c
@@ -115,7 +115,7 @@ static int __cfg80211_join_ibss(struct cfg80211_registered_device *rdev,
        }
 
        if (WARN_ON(wdev->connect_keys))
-               kfree(wdev->connect_keys);
+               kzfree(wdev->connect_keys);
        wdev->connect_keys = connkeys;
 
        wdev->ibss_fixed = params->channel_fixed;
@@ -161,7 +161,7 @@ static void __cfg80211_clear_ibss(struct net_device *dev, bool nowext)
 
        ASSERT_WDEV_LOCK(wdev);
 
-       kfree(wdev->connect_keys);
+       kzfree(wdev->connect_keys);
        wdev->connect_keys = NULL;
 
        rdev_set_qos_map(rdev, dev, NULL);