From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: USB: hso: Fix OOB memory access in hso_probe/hso_get_config_data From: Greg Kroah-Hartman Message-Id: <20181209163245.GA25484@kroah.com> Date: Sun, 9 Dec 2018 17:32:45 +0100 To: "David S. Miller" , netdev@vger.kernel.org Cc: linux-usb@vger.kernel.org, Sebastian Andrzej Siewior , Hui Peng , Mathias Payer List-ID: RnJvbTogSHVpIFBlbmcgPGJlbnF1aWtlQGdtYWlsLmNvbT4KClRoZSBmdW5jdGlvbiBoc29fcHJv YmUgcmVhZHMgaWZfbnVtIGZyb20gdGhlIFVTQiBkZXZpY2UgKGFzIGFuIHU4KSBhbmQgdXNlcwpp dCB3aXRob3V0IGEgbGVuZ3RoIGNoZWNrIHRvIGluZGV4IGFuIGFycmF5LCByZXN1bHRpbmcgaW4g YW4gT09CIG1lbW9yeSByZWFkCmluIGhzb19wcm9iZSBvciBoc29fZ2V0X2NvbmZpZ19kYXRhLiBB ZGRlZCBhIGxlbmd0aCBjaGVjayBmb3IgYm90aCBsb2NhdGlvbnMKYW5kIHVwZGF0ZWQgaHNvX3By b2JlIHRvIGJhaWwgb24gZXJyb3IuCgpSZXBvcnRlZC1ieTogSHVpIFBlbmcgPGJlbnF1aWtlQGdt YWlsLmNvbT4KUmVwb3J0ZWQtYnk6IE1hdGhpYXMgUGF5ZXIgPG1hdGhpYXMucGF5ZXJAbmViZWx3 ZWx0Lm5ldD4KU2lnbmVkLW9mZi1ieTogSHVpIFBlbmcgPGJlbnF1aWtlQGdtYWlsLmNvbT4KU2ln bmVkLW9mZi1ieTogTWF0aGlhcyBQYXllciA8bWF0aGlhcy5wYXllckBuZWJlbHdlbHQubmV0PgpT aWduZWQtb2ZmLWJ5OiBHcmVnIEtyb2FoLUhhcnRtYW4gPGdyZWdraEBsaW51eGZvdW5kYXRpb24u b3JnPgotLS0KIGRyaXZlcnMvbmV0L3VzYi9oc28uYyB8IDE4ICsrKysrKysrKysrKysrKystLQog MSBmaWxlIGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9uZXQvdXNiL2hzby5jIGIvZHJpdmVycy9uZXQvdXNiL2hzby5jCmluZGV4 IDE4NGMyNGJhY2ExNS4uMTY4ZjkwODFkNGVhIDEwMDY0NAotLS0gYS9kcml2ZXJzL25ldC91c2Iv aHNvLmMKKysrIGIvZHJpdmVycy9uZXQvdXNiL2hzby5jCkBAIC0yODA3LDYgKzI4MDcsMTIgQEAg c3RhdGljIGludCBoc29fZ2V0X2NvbmZpZ19kYXRhKHN0cnVjdCB1c2JfaW50ZXJmYWNlICppbnRl cmZhY2UpCiAJCXJldHVybiAtRUlPOwogCX0KIAorCS8qIGNoZWNrIGlmIHdlIGhhdmUgYSB2YWxp ZCBpbnRlcmZhY2UgKi8KKwlpZiAoaWZfbnVtID4gMTYpIHsKKwkJa2ZyZWUoY29uZmlnX2RhdGEp OworCQlyZXR1cm4gLUVJTlZBTDsKKwl9CisKIAlzd2l0Y2ggKGNvbmZpZ19kYXRhW2lmX251bV0p IHsKIAljYXNlIDB4MDoKIAkJcmVzdWx0ID0gMDsKQEAgLTI4NzcsMTAgKzI4ODMsMTggQEAgc3Rh dGljIGludCBoc29fcHJvYmUoc3RydWN0IHVzYl9pbnRlcmZhY2UgKmludGVyZmFjZSwKIAogCS8q IEdldCB0aGUgaW50ZXJmYWNlL3BvcnQgc3BlY2lmaWNhdGlvbiBmcm9tIGVpdGhlciBkcml2ZXJf aW5mbyBvciBmcm9tCiAJICogdGhlIGRldmljZSBpdHNlbGYgKi8KLQlpZiAoaWQtPmRyaXZlcl9p bmZvKQorCWlmIChpZC0+ZHJpdmVyX2luZm8pIHsKKwkJLyogaWZfbnVtIGlzIGNvbnRyb2xsZWQg YnkgdGhlIGRldmljZSwgZHJpdmVyX2luZm8gaXMgYSAwIHRlcm1pbmF0ZWQKKwkJICogYXJyYXku IE1ha2Ugc3VyZSwgdGhlIGFjY2VzcyBpcyBpbiBib3VuZHMhICovCisJCWZvciAoaSA9IDA7IGkg PD0gaWZfbnVtOyArK2kpCisJCQlpZiAoKCh1MzIgKikoaWQtPmRyaXZlcl9pbmZvKSlbaV0gPT0g MCkKKwkJCQlnb3RvIGV4aXQ7CiAJCXBvcnRfc3BlYyA9ICgodTMyICopKGlkLT5kcml2ZXJfaW5m bykpW2lmX251bV07Ci0JZWxzZQorCX0gZWxzZSB7CiAJCXBvcnRfc3BlYyA9IGhzb19nZXRfY29u ZmlnX2RhdGEoaW50ZXJmYWNlKTsKKwkJaWYgKElTX0VSUl9WQUxVRSgobG9uZylwb3J0X3NwZWMp KQorCQkJZ290byBleGl0OworCX0KIAogCS8qIENoZWNrIGlmIHdlIG5lZWQgdG8gc3dpdGNoIHRv IGFsdCBpbnRlcmZhY2VzIHByaW9yIHRvIHBvcnQKIAkgKiBjb25maWd1cmF0aW9uICovCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: [PATCH] USB: hso: Fix OOB memory access in hso_probe/hso_get_config_data Date: Sun, 9 Dec 2018 17:32:45 +0100 Message-ID: <20181209163245.GA25484@kroah.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: linux-usb@vger.kernel.org, Sebastian Andrzej Siewior , Hui Peng , Mathias Payer To: "David S. Miller" , netdev@vger.kernel.org Return-path: Received: from mail.kernel.org ([198.145.29.99]:58020 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726086AbeLIQcs (ORCPT ); Sun, 9 Dec 2018 11:32:48 -0500 Content-Disposition: inline Sender: netdev-owner@vger.kernel.org List-ID: From: Hui Peng 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. Added a length check for both locations and updated hso_probe to bail on error. Reported-by: Hui Peng Reported-by: Mathias Payer Signed-off-by: Hui Peng Signed-off-by: Mathias Payer Signed-off-by: Greg Kroah-Hartman --- drivers/net/usb/hso.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c index 184c24baca15..168f9081d4ea 100644 --- a/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c @@ -2807,6 +2807,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; @@ -2877,10 +2883,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 (IS_ERR_VALUE((long)port_spec)) + goto exit; + } /* Check if we need to switch to alt interfaces prior to port * configuration */ -- 2.19.2