adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

PS3: gelic: fix the oops on the broken IE returned from the hypervisor

Browse source 
This fixes the bug that the driver would try to over-scan the memory
if the sum of the length field of every IEs does not match the length
returned from the hypervisor.

Signed-off-by: Masakazu Mokuno <mokuno@sm.sony.co.jp>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Masakazu Mokuno 2008-04-14 18:07:21 +09:00 committed by John W. Linville
parent dc4ae1f46d
commit b358492cd2
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/net/ps3_gelic_wireless.c
View file

@ -512,13 +512,18 @@ static void gelic_wl_parse_ie(u8 *data, size_t len,
data, len);
memset(ie_info, 0, sizeof(struct ie_info));
while (0 < data_left) {
while (2 <= data_left) {
item_id = *pos++;
item_len = *pos++;
data_left -= 2;
if (data_left < item_len)
break;
switch (item_id) {
case MFIE_TYPE_GENERIC:
if (!memcmp(pos, wpa_oui, OUI_LEN) &&
if ((OUI_LEN + 1 <= item_len) &&
!memcmp(pos, wpa_oui, OUI_LEN) &&
pos[OUI_LEN] == 0x01) {
ie_info->wpa.data = pos - 2;
ie_info->wpa.len = item_len + 2;
@ -535,7 +540,7 @@ static void gelic_wl_parse_ie(u8 *data, size_t len,
break;
}
pos += item_len;
data_left -= item_len + 2;
data_left -= item_len;
}
pr_debug("%s: wpa=%p,%d wpa2=%p,%d\n", __func__,
ie_info->wpa.data, ie_info->wpa.len,