diff options
| author | Patrick Tjin <pattjin@google.com> | 2016-02-11 13:20:44 -0800 |
|---|---|---|
| committer | Andrew Bresticker <abrestic@google.com> | 2016-02-26 23:48:51 +0000 |
| commit | 941dd599fba20bd86a695293209976d47078ae67 (patch) | |
| tree | d22c93a3cd721f3999d9e4132dc6290bc5745f39 | |
| parent | cef1f0aa10235139d686160678cf06ffcc19ee6f (diff) | |
ANDROID: net: wireless: bcmdhd: Do not print out device name on invalid lengthM5C14J
Bug: 27142322
Change-Id: I298f5a424b0fbb464f4281aa5e83d1fdbbe777f8
Signed-off-by: Patrick Tjin <pattjin@google.com>
Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
Reviewed-on: https://chrome-internal-review.googlesource.com/249659
Reviewed-by: Andrew Bresticker <abrestic@google.com>
Commit-Queue: Andrew Bresticker <abrestic@google.com>
Tested-by: Andrew Bresticker <abrestic@google.com>
| -rw-r--r-- | drivers/net/wireless/bcmdhd/wl_cfg80211.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c index a8441158362d..43623466b744 100644 --- a/drivers/net/wireless/bcmdhd/wl_cfg80211.c +++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.c @@ -1174,10 +1174,12 @@ wl_validate_wps_ie(char *wps_ie, s32 wps_ie_len, bool *pbc) } else if (subelt_id == WPS_ID_DEVICE_NAME) { char devname[100]; size_t namelen = MIN(subelt_len, sizeof(devname)); - memcpy(devname, subel, namelen); - devname[namelen-1] = '\0'; - WL_DBG((" attr WPS_ID_DEVICE_NAME: %s (len %u)\n", - devname, subelt_len)); + if (namelen) { + memcpy(devname, subel, namelen); + devname[namelen - 1] = '\0'; + WL_DBG((" attr WPS_ID_DEVICE_NAME: %s (len %u)\n", + devname, subelt_len)); + } } else if (subelt_id == WPS_ID_DEVICE_PWD_ID) { valptr[0] = *subel; valptr[1] = *(subel + 1); |