evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

USB: hso: Fix OOB memory access in hso_probe/hso_get_config_data

Browse source 
commit 5146f95df782b0ac61abde36567e718692725c89 upstream.

The function hso_probe reads if_num from the USB device (as an u8) and uses
it without a length check to index an array, resulting in an OOB memory read
in hso_probe or hso_get_config_data.

Add a length check for both locations and updated hso_probe to bail on
error.

This issue has been assigned CVE-2018-19985.

Reported-by: Hui Peng <benquike@gmail.com>
Reported-by: Mathias Payer <mathias.payer@nebelwelt.net>
Signed-off-by: Hui Peng <benquike@gmail.com>
Signed-off-by: Mathias Payer <mathias.payer@nebelwelt.net>
Reviewed-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Hui Peng 2018-12-12 12:42:24 +01:00 • committed by Greg Kroah-Hartman
parent ba0da581b4
commit 8846b1dbfd
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/net/usb/hso.c
View file

@ -2825,6 +2825,12 @@ static int hso_get_config_data(struct usb_interface *interface)
return -EIO;
}
/* check if we have a valid interface */
if (if_num > 16) {
kfree(config_data);
return -EINVAL;
}
switch (config_data[if_num]) {
case 0x0:
result = 0;
@ -2895,10 +2901,18 @@ static int hso_probe(struct usb_interface *interface,
/* Get the interface/port specification from either driver_info or from
* the device itself */
if (id->driver_info)
if (id->driver_info) {
/* if_num is controlled by the device, driver_info is a 0 terminated
* array. Make sure, the access is in bounds! */
for (i = 0; i <= if_num; ++i)
if (((u32 *)(id->driver_info))[i] == 0)
goto exit;
port_spec = ((u32 *)(id->driver_info))[if_num];
else
} else {
port_spec = hso_get_config_data(interface);
if (port_spec < 0)
goto exit;
}
/* Check if we need to switch to alt interfaces prior to port
* configuration */