diff options
| author | Patrick Tjin <pattjin@google.com> | 2016-02-11 13:20:44 -0800 |
|---|---|---|
| committer | Andres Morales <anmorales@google.com> | 2016-03-21 17:23:56 -0700 |
| commit | 720246539316d31c7426c77dd0540c6328dcb948 (patch) | |
| tree | 2db5e35a0199277c0e6954d29284d14a418917b0 | |
| parent | 1017cd3f17afefaff42d6b17e0c0d57d5b782efb (diff) | |
| download | tegra-android-tegra-flounder-3.10-marshmallow-mr1.tar.gz | |
net: wireless: bcmdhd: Do not print out device name on invalid lengthandroid-6.0.1_r0.33android-tegra-flounder-3.10-marshmallow-mr1
(cherry picked from commit b149dd5d22c3e4c2faab0bb934a018888ff99ef3)
Change-Id: I6fdc3a89c270b7b4ba43de4be7ea9fc41a424d9e
Signed-off-by: Patrick Tjin <pattjin@google.com>
Bug: 27142322
| -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 a12d96cd8e18..d4e152e643db 100644 --- a/drivers/net/wireless/bcmdhd/wl_cfg80211.c +++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.c @@ -1175,10 +1175,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); |