summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-07-25 16:54:36 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-07-29 15:46:06 -0400
commitc0b2bbd833a5a26b5a9425cb9a7eb66bbe736dd1 (patch)
tree61c4b2279ef24c0d6f389da851fff79c83100eff
parentcbdec9758736c30ecbb03651b0c2915c442a5895 (diff)
downloadop-kernel-dev-c0b2bbd833a5a26b5a9425cb9a7eb66bbe736dd1.zip
op-kernel-dev-c0b2bbd833a5a26b5a9425cb9a7eb66bbe736dd1.tar.gz
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>
-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 283f1a8..c951eb2 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -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]) {
OpenPOWER on IntegriCloud