From 704da4512217f78baf85eb77b5e07ababba7a7ce Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 29 Oct 2008 11:43:32 +0100 Subject: [PATCH] --- yaml --- r: 118317 b: refs/heads/master c: 48735d8d8bd701b1e0cd3d49c21e5e385ddcb077 h: refs/heads/master i: 118315: 904916d821a2a514fb6e80e9dd8a8f21ae7c62d0 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/scan.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 92d26783878f..deef9933550f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87bf24f3d2e076468deaa5181d44184887072904 +refs/heads/master: 48735d8d8bd701b1e0cd3d49c21e5e385ddcb077 diff --git a/trunk/drivers/net/wireless/libertas/scan.c b/trunk/drivers/net/wireless/libertas/scan.c index 8f66903641b9..22c4c6110521 100644 --- a/trunk/drivers/net/wireless/libertas/scan.c +++ b/trunk/drivers/net/wireless/libertas/scan.c @@ -598,8 +598,8 @@ static int lbs_process_bss(struct bss_descriptor *bss, switch (elem->id) { case MFIE_TYPE_SSID: - bss->ssid_len = elem->len; - memcpy(bss->ssid, elem->data, elem->len); + bss->ssid_len = min_t(int, 32, elem->len); + memcpy(bss->ssid, elem->data, bss->ssid_len); lbs_deb_scan("got SSID IE: '%s', len %u\n", escape_essid(bss->ssid, bss->ssid_len), bss->ssid_len);