Staging: vt6656: add some range checks before memcpy()
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 20 Oct 2011 06:10:39 +0000 (09:10 +0300)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sun, 23 Oct 2011 08:13:20 +0000 (10:13 +0200)
We need to verify that we're not writing past the end of the array.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/vt6656/ioctl.c

index 2cde4f0..4939002 100644 (file)
@@ -81,6 +81,8 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)
                }
 
                pItemSSID = (PWLAN_IE_SSID)sScanCmd.ssid;
+               if (pItemSSID->len > WLAN_SSID_MAXLEN + 1)
+                       return -EINVAL;
                if (pItemSSID->len != 0) {
                        memset(abyScanSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
                        memcpy(abyScanSSID, pItemSSID, pItemSSID->len + WLAN_IEHDR_LEN);
@@ -155,6 +157,8 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)
                }
 
                pItemSSID = (PWLAN_IE_SSID)sJoinCmd.ssid;
+               if (pItemSSID->len > WLAN_SSID_MAXLEN + 1)
+                       return -EINVAL;
                memset(pMgmt->abyDesireSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
                memcpy(pMgmt->abyDesireSSID, pItemSSID, pItemSSID->len + WLAN_IEHDR_LEN);
                if (sJoinCmd.wBSSType == ADHOC) {
@@ -476,6 +480,8 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)
                }
 
                pItemSSID = (PWLAN_IE_SSID)sStartAPCmd.ssid;
+               if (pItemSSID->len > WLAN_SSID_MAXLEN + 1)
+                       return -EINVAL;
                memset(pMgmt->abyDesireSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
                memcpy(pMgmt->abyDesireSSID, pItemSSID, pItemSSID->len + WLAN_IEHDR_LEN);