commit c3453e435d8089a31dc2eafd522655d5dead55d5
author Patrick Tjin <pattjin@google.com> Thu Feb 11 13:20:44 2016 -0800
committer Devin Kim <dojip.kim@lge.com> Tue Feb 16 14:08:18 2016 -0800
tree 73c5f732ff217dc1c1bf8f38f97e4f0491b0b72b
parent 1fc0d36d2d5451e8a37e8eea10b4c7551854d85f

net: wireless: bcmdhd: Do not print out device name on invalid length

Bug: 27142322

Picked from Nexus5(HH)
Change-Id: I58edfc6998da705f2b6710c835ae8a4dfe2a3cc1
Signed-off-by: Devin Kim <dojip.kim@lge.com>

drivers/net/wireless/bcmdhd/src/wl/sys/wl_cfg80211.c

diff --git a/drivers/net/wireless/bcmdhd/src/wl/sys/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/src/wl/sys/wl_cfg80211.c
index d63e872..29d92cb 100644
--- a/drivers/net/wireless/bcmdhd/src/wl/sys/wl_cfg80211.c
+++ b/drivers/net/wireless/bcmdhd/src/wl/sys/wl_cfg80211.c
@@ -1159,10 +1159,12 @@
 		} else if (subelt_id == WPS_ID_DEVICE_NAME) {
 			char devname[100];
 			size_t namelen = MIN(subelt_len, sizeof(devname));
-			memcpy(devname, subel, namelen);
-			devname[subelt_len-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);