summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-02-28 11:21:46 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-29 15:55:52 -0800
commit625aeb3abac00f36efc82077d56ae278093ce467 (patch)
treea3dd76568769b846c72f1c861bd7507448583ead
parent7223e86d57b5aad6c7d8d92b2d3528a54d27d664 (diff)
Staging: wlan-ng: still setting wrong data
In commit 1ca1a92cc6 "Staging: wlan-ng: memsetting the wrong amount of data" I changed the code so we didn't memset() past the end of the msg1.bssid.data[] array. Walter Harms noticed that it was weird that we were setting the len to 6 when there were 7 elements in the array. Pavel Roskin pointed out that the intent of the code was actually to memset() msg1.bssid.data.data[] which is a 6 character array. Reported-by: Walter Harms <wharms@bfs.de> Reported-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/wlan-ng/cfg80211.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c
index d518b315b368..4cd3ba5d5646 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -356,7 +356,7 @@ int prism2_scan(struct wiphy *wiphy, struct net_device *dev,
msg1.msgcode = DIDmsg_dot11req_scan;
msg1.bsstype.data = P80211ENUM_bsstype_any;
- memset(&msg1.bssid.data, 0xFF, sizeof(msg1.bssid.data));
+ memset(&msg1.bssid.data.data, 0xFF, sizeof(msg1.bssid.data.data));
msg1.bssid.data.len = 6;
if (request->n_ssids > 0) {