From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29232C43387 for ; Wed, 26 Dec 2018 23:22:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E056420811 for ; Wed, 26 Dec 2018 23:22:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545866576; bh=c9PO6q+ugDe2Bn20uNZ/lgNPtJrlDRejHizgCI43wxs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DvXj/aCnSfjoyS55/BFA1WsK2Mh6LWG8mFWzMgUgiT/pbnNvQ48qSgUK1wqeKXjnI AWgQcSFvJxhHjDSDwFyddPZ6rGrzz3YstRNh94lfrvo3soLIoIlZ/0ZEdL3ltj6rpX MatwDFZkkijxLKwtD+2OC+Q5fbYkQgaG0izEPIeM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728606AbeLZXWS (ORCPT ); Wed, 26 Dec 2018 18:22:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:43850 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728081AbeLZXWN (ORCPT ); Wed, 26 Dec 2018 18:22:13 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 079562084A; Wed, 26 Dec 2018 23:22:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545866533; bh=c9PO6q+ugDe2Bn20uNZ/lgNPtJrlDRejHizgCI43wxs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0tn17hPFsPc8SNL6UPBBvf64ezseyN23BmXBHJJUUdSvRjJo8IdacdkFpRRgLODxS xHk/H68wPUQ4QbuEa+7DS5K6wnciTfYysUEkVFr7iS4l+NWa5hARHTKzLg9LgqoMSW 6rglpAuslN8JjPe3W/ISbNzD5FErYTgIgBCo/br4= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Hui Peng , Mathias Payer , Greg Kroah-Hartman , "David S . Miller" , Sasha Levin , linux-usb@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 3.18 05/12] USB: hso: Fix OOB memory access in hso_probe/hso_get_config_data Date: Wed, 26 Dec 2018 17:57:33 -0500 Message-Id: <20181226225741.151608-5-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181226225741.151608-1-sashal@kernel.org> References: <20181226225741.151608-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hui Peng [ Upstream commit 5146f95df782b0ac61abde36567e718692725c89 ] 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 Reported-by: Mathias Payer Signed-off-by: Hui Peng Signed-off-by: Mathias Payer Reviewed-by: Sebastian Andrzej Siewior Signed-off-by: Greg Kroah-Hartman Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- 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 babda7d8693e..f040bf558430 100644 --- a/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c @@ -2814,6 +2814,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; @@ -2884,10 +2890,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 */ -- 2.19.1