Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp5862936pxb; Mon, 14 Feb 2022 09:16:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJxzIUvri2GbB94MRi8kbeFyBqx1f0sPXMT47g43hDhrcrnVGLRvdlTcWmznsFVSqUsxld7Q X-Received: by 2002:a05:6402:430e:: with SMTP id m14mr677634edc.86.1644858980214; Mon, 14 Feb 2022 09:16:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644858980; cv=none; d=google.com; s=arc-20160816; b=BS+I402hCHVIIe4//DwRu4q2iNC8HwElElAPfz3DMi7U0HaP1GKMce3Z9uAE/Jylgz HLYWi5NmLEYjI2r5AhpuoakaY7Vkdc0q0KOyCslvWwxSH3GooM9beOxEH5/zghJpraeF PMqrAiDFu3CATMvr4ihVeuVGYJmEcWC9cmcmP0v3q6Dy9YcqMFpwThr/hPSTVe2ur6Fm Oxc0oLOoq++g2GeRrlQlBylwUOeo7q34zWRv/GHhrQMesMDGICf3MwKZciND4Td46eXu 4lLh76WoLBrXjNkz/TvzjKS7inLF9vE1SMTR3Fj+jeKP+9GE9eHPLIet5qq/Rp1XtMP4 LJAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2x6hSJx2Mlgkn99+ULsjVHh3e6Vhm8qDOQu7/WgRyWM=; b=ljPmSdbe9k/VGmxZY6JsqcziEo3Yp9jgLl9ItX6nbAsRoElTMS8WV3MepgakbB9wYA e9Z060z9IIYs79suDzNMlQ3+YNQOaWUh06JDmbCCOp9dAWJw1PVjDojLSKinjVEtWxDk gcqJo6vI5gw/nW/koWWZrnhmEYyu+I4yKH6dofGbVU5JijmEieb++V4iFBTqsotsAlg/ R1wKY57D7xt41c1ekzGKEP/82LaWZvaClO+bjZDJPWx5Ql5HaCExU+aX13YzmZeiFUfJ Z68ct/ZLLqATJyfkLB4W0fnE1+OxDNn7mNv8MzFD3kTLFGppdRfEIOf6Y18aa5KiIHgG w6ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=z5O5zNgA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hs4si1911073ejc.382.2022.02.14.09.15.53; Mon, 14 Feb 2022 09:16:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=z5O5zNgA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243186AbiBNJrF (ORCPT + 99 others); Mon, 14 Feb 2022 04:47:05 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:42982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245164AbiBNJoi (ORCPT ); Mon, 14 Feb 2022 04:44:38 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 967336A00F; Mon, 14 Feb 2022 01:38:18 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3227761172; Mon, 14 Feb 2022 09:38:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 09B1EC340E9; Mon, 14 Feb 2022 09:38:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1644831497; bh=W/rZpCwWfP2MIfCd7ghjXQZP0wpoXvZV20V3NBzfweU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=z5O5zNgAW2JrRNAtjA1UVa23tedy30aksHWmf27YHqrdSJ3I1GMhwT9afTULP9ESK ZbW4j4Rpt42YhmbQv/zocnetR5nLuTxRu9cJwctPRDyGYKvpR5AJN72PTT1SpBzkXk 9yeR6X1kLRbImViDmF/KmmZQIWL3jYl+bxkYbBPc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Szymon Heidrich , stable@kernel.org Subject: [PATCH 5.4 59/71] USB: gadget: validate interface OS descriptor requests Date: Mon, 14 Feb 2022 10:26:27 +0100 Message-Id: <20220214092454.028781469@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220214092452.020713240@linuxfoundation.org> References: <20220214092452.020713240@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Szymon Heidrich commit 75e5b4849b81e19e9efe1654b30d7f3151c33c2c upstream. Stall the control endpoint in case provided index exceeds array size of MAX_CONFIG_INTERFACES or when the retrieved function pointer is null. Signed-off-by: Szymon Heidrich Cc: stable@kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/usb/gadget/composite.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -1944,6 +1944,9 @@ unknown: if (w_index != 0x5 || (w_value >> 8)) break; interface = w_value & 0xFF; + if (interface >= MAX_CONFIG_INTERFACES || + !os_desc_cfg->interface[interface]) + break; buf[6] = w_index; count = count_ext_prop(os_desc_cfg, interface);