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=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 7C355C43381 for ; Mon, 1 Apr 2019 17:50:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 48B0D20830 for ; Mon, 1 Apr 2019 17:50:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554141018; bh=L8CyF+CMgYTZ0IArEemAwUOqqlJgH4yS12nqa93qBxU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=e8eKGRKQZLvVbE/RCHYWckJXqIdD8P+kUtUCynLOR95ULIhzcfT+4/CI9F7XYtMdB KaKuiY9UlHoRxp4Pq94NLtX16/CQpKdLAwMpgoYTqUkxEC+e1yEWpEJlzvHcbhuJTX zhlMNgh1YLeSSYUaJxQzhh0smhkaE5Ks1qf2Ay/Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732552AbfDAR25 (ORCPT ); Mon, 1 Apr 2019 13:28:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:35044 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732507AbfDAR2z (ORCPT ); Mon, 1 Apr 2019 13:28:55 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1CE1421852; Mon, 1 Apr 2019 17:28:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554139734; bh=L8CyF+CMgYTZ0IArEemAwUOqqlJgH4yS12nqa93qBxU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mz1ff+jyAb/Ein55jbBDP8cGn4/bfdCxa9fn/u3vQA9eabJrwwfPBcfE8WCrmXxPb OVX/DYANLdXydalL9zUuvpBh6u/wnsNBJWGuxDcBZfFvGSm9DoblTz0uiVDXI/e1tF MMOaV64Lt4QWKJ/6fGaUy7K7e8OLfunndhqvNjZY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andrey Konovalov , Nathan Chancellor , Arnd Bergmann Subject: [PATCH 4.9 55/56] Revert "USB: core: only clean up what we allocated" Date: Mon, 1 Apr 2019 19:03:11 +0200 Message-Id: <20190401170106.887083062@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190401170103.398401360@linuxfoundation.org> References: <20190401170103.398401360@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Greg Kroah-Hartman commit cf4df407e0d7cde60a45369c2a3414d18e2d4fdd upstream. This reverts commit 32fd87b3bbf5f7a045546401dfe2894dbbf4d8c3. Alan wrote a better fix for this... Cc: Andrey Konovalov Cc: stable Cc: Nathan Chancellor Cc: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman --- drivers/usb/core/config.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) --- a/drivers/usb/core/config.c +++ b/drivers/usb/core/config.c @@ -763,21 +763,18 @@ void usb_destroy_configuration(struct us return; if (dev->rawdescriptors) { - for (i = 0; i < dev->descriptor.bNumConfigurations && - i < USB_MAXCONFIG; i++) + for (i = 0; i < dev->descriptor.bNumConfigurations; i++) kfree(dev->rawdescriptors[i]); kfree(dev->rawdescriptors); dev->rawdescriptors = NULL; } - for (c = 0; c < dev->descriptor.bNumConfigurations && - c < USB_MAXCONFIG; c++) { + for (c = 0; c < dev->descriptor.bNumConfigurations; c++) { struct usb_host_config *cf = &dev->config[c]; kfree(cf->string); - for (i = 0; i < cf->desc.bNumInterfaces && - i < USB_MAXINTERFACES; i++) { + for (i = 0; i < cf->desc.bNumInterfaces; i++) { if (cf->intf_cache[i]) kref_put(&cf->intf_cache[i]->ref, usb_release_interface_cache);