diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2011-10-20 02:10:39 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-23 04:13:20 -0400 |
commit | 44ec5d29169426b00fe054f0a13744140de29e11 (patch) | |
tree | 7386bd46141b1ff8b8deec5a28d419672f9c8633 /drivers | |
parent | 883aeecc9ddc120e34a1157aee37738a4e96b517 (diff) |
Staging: vt6656: add some range checks before memcpy()
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/vt6656/ioctl.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/staging/vt6656/ioctl.c b/drivers/staging/vt6656/ioctl.c index 2cde4f0c0469..49390026dea3 100644 --- a/drivers/staging/vt6656/ioctl.c +++ b/drivers/staging/vt6656/ioctl.c | |||
@@ -81,6 +81,8 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) | |||
81 | } | 81 | } |
82 | 82 | ||
83 | pItemSSID = (PWLAN_IE_SSID)sScanCmd.ssid; | 83 | pItemSSID = (PWLAN_IE_SSID)sScanCmd.ssid; |
84 | if (pItemSSID->len > WLAN_SSID_MAXLEN + 1) | ||
85 | return -EINVAL; | ||
84 | if (pItemSSID->len != 0) { | 86 | if (pItemSSID->len != 0) { |
85 | memset(abyScanSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1); | 87 | memset(abyScanSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1); |
86 | memcpy(abyScanSSID, pItemSSID, pItemSSID->len + WLAN_IEHDR_LEN); | 88 | memcpy(abyScanSSID, pItemSSID, pItemSSID->len + WLAN_IEHDR_LEN); |
@@ -155,6 +157,8 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) | |||
155 | } | 157 | } |
156 | 158 | ||
157 | pItemSSID = (PWLAN_IE_SSID)sJoinCmd.ssid; | 159 | pItemSSID = (PWLAN_IE_SSID)sJoinCmd.ssid; |
160 | if (pItemSSID->len > WLAN_SSID_MAXLEN + 1) | ||
161 | return -EINVAL; | ||
158 | memset(pMgmt->abyDesireSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1); | 162 | memset(pMgmt->abyDesireSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1); |
159 | memcpy(pMgmt->abyDesireSSID, pItemSSID, pItemSSID->len + WLAN_IEHDR_LEN); | 163 | memcpy(pMgmt->abyDesireSSID, pItemSSID, pItemSSID->len + WLAN_IEHDR_LEN); |
160 | if (sJoinCmd.wBSSType == ADHOC) { | 164 | if (sJoinCmd.wBSSType == ADHOC) { |
@@ -476,6 +480,8 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) | |||
476 | } | 480 | } |
477 | 481 | ||
478 | pItemSSID = (PWLAN_IE_SSID)sStartAPCmd.ssid; | 482 | pItemSSID = (PWLAN_IE_SSID)sStartAPCmd.ssid; |
483 | if (pItemSSID->len > WLAN_SSID_MAXLEN + 1) | ||
484 | return -EINVAL; | ||
479 | memset(pMgmt->abyDesireSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1); | 485 | memset(pMgmt->abyDesireSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1); |
480 | memcpy(pMgmt->abyDesireSSID, pItemSSID, pItemSSID->len + WLAN_IEHDR_LEN); | 486 | memcpy(pMgmt->abyDesireSSID, pItemSSID, pItemSSID->len + WLAN_IEHDR_LEN); |
481 | 487 | ||