aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless/nl80211.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-07-25 10:54:36 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-07-29 15:46:06 -0400
commitc0b2bbd833a5a26b5a9425cb9a7eb66bbe736dd1 (patch)
tree61c4b2279ef24c0d6f389da851fff79c83100eff /net/wireless/nl80211.c
parentcbdec9758736c30ecbb03651b0c2915c442a5895 (diff)
nl80211: add missing parameter clearing
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>
Diffstat (limited to 'net/wireless/nl80211.c')
-rw-r--r--net/wireless/nl80211.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 283f1a890dad..c951eb2b07d5 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -3385,6 +3385,8 @@ static int nl80211_crypto_settings(struct genl_info *info,
3385 struct cfg80211_crypto_settings *settings, 3385 struct cfg80211_crypto_settings *settings,
3386 int cipher_limit) 3386 int cipher_limit)
3387{ 3387{
3388 memset(settings, 0, sizeof(*settings));
3389
3388 settings->control_port = info->attrs[NL80211_ATTR_CONTROL_PORT]; 3390 settings->control_port = info->attrs[NL80211_ATTR_CONTROL_PORT];
3389 3391
3390 if (info->attrs[NL80211_ATTR_CIPHER_SUITES_PAIRWISE]) { 3392 if (info->attrs[NL80211_ATTR_CIPHER_SUITES_PAIRWISE]) {