nl80211: add missing parameter clearing
authorJohannes Berg <johannes@sipsolutions.net>
Sat, 25 Jul 2009 14:54:36 +0000 (16:54 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 29 Jul 2009 19:46:06 +0000 (15:46 -0400)
Jouni and Maxim reported an oops when using wpa_supplicant -Dnl80211,
which seems to be due to random data being contained in the crypto
settings for the assoc() command. This seems to be due to the missing
memset here, so add it -- it's certainly missing but I'm not 100%
certain that it will fix the problem.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/wireless/nl80211.c

index 283f1a890dad793851826236b0dc7de9b9e1d04e..c951eb2b07d5864d851bda1b2c6380fd1061347a 100644 (file)
@@ -3385,6 +3385,8 @@ static int nl80211_crypto_settings(struct genl_info *info,
                                   struct cfg80211_crypto_settings *settings,
                                   int cipher_limit)
 {
+       memset(settings, 0, sizeof(*settings));
+
        settings->control_port = info->attrs[NL80211_ATTR_CONTROL_PORT];
 
        if (info->attrs[NL80211_ATTR_CIPHER_SUITES_PAIRWISE]) {