Merge tag 'staging-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[firefly-linux-kernel-4.4.55.git] / drivers / staging / wlags49_h2 / wl_main.c

diff --git a/drivers/staging/wlags49_h2/wl_main.c b/drivers/staging/wlags49_h2/wl_main.c
index f28f15baea96460b11631004a57f22a46e94c5c5..43535610acc46d49cd06f0b50f4a948747ff951f 100644 (file)
--- a/drivers/staging/wlags49_h2/wl_main.c
+++ b/drivers/staging/wlags49_h2/wl_main.c
@@ -3171,7 +3171,9 @@ void wl_process_mailbox( struct wl_private *lp )
 
                                        memset( ssid, 0, sizeof( ssid ));
                                        strncpy( ssid, &probe_rsp->rawData[2],
-                                                        probe_rsp->rawData[1] );
+                                                min_t(u8,
+                                                       probe_rsp->rawData[1],
+                                                       HCF_MAX_NAME_LEN - 1));
 
                                        DBG_TRACE( DbgInfo, "(%s) SSID        : %s\n",
                                                           lp->dev->name, ssid );