From patchwork Thu Aug 20 09:22:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 248018 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:522:0:0:0:0 with SMTP id h2csp1220170ils; Thu, 20 Aug 2020 03:21:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzyQ/aWimr0FNaNzRsyE7/a5BaDNBgS2FRQ7sQb8VTs5wddTtwghcCfpt/88dOci99nfLB8 X-Received: by 2002:a17:906:a284:: with SMTP id i4mr2620180ejz.490.1597918880054; Thu, 20 Aug 2020 03:21:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597918880; cv=none; d=google.com; s=arc-20160816; b=AEKyYNBknKhvGap5tmdnLYWt/XkoTiACCOO7QjWkXPc+/ex7ySd/Eyh8xVAr1k4H+Y Mx9z/84DpfeqepwFljdPe6HEZi0ULvL0/Lea99aPFqru4ytNApqR6xOgsu4BVe4ehFpd eHo2tjSCcVgnCMhCuTxDIBTWmix1Q4dRxLrBrEwAD+DBATiuP6HWk7hV9sBtizroJd/D 2EJvpOvXkZYUqXp5RlJg3qrk/G4JdrWz72+jgvx9Cnoh/7FcPkQwjYeKXJsj8Q/WQY5J MLmbnTJWOIpgWrkfB0+k60HcNWRX4FKt/rr0TFCGNewnBBfq5qdxx/qhH1BMpk0e7wXh vaIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=27BlARBQQwXVscYwY+DtPzhxCQxoTR0F0e5rXveJ2mI=; b=AL9ZNxDxKxc3BlP7XvSmnrbwWX0jVdZGVCo8aN4hwFtmBG1xzG1seDos6VxEoF+I+U NPyOQiPjYXKdrmV5JtPVYejtDdRqJmMh86GUrMV8qsXMp9GClUTbshIVUmHDudRyTCaI Zv6m6VqDJXal2dkVv9oFPHiKjFJ9bmyqdV3PdG4/qn2E8NpYS7lT7jzTOaVNwfO//WBX cTrtH/aGAfLKlYrf6qLOvfWXBpMSumjLkQNNTIOHf/mvF5PqB7lKPYgoxlAeoS6k5cco xoh6qJ4b6MzzoB2NMzOVrKRSxKT4MmgRO4P3siGxhTt4odESa1Cj2plNWjWoYjHeZ0t9 LkKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yvNAoiZ8; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g18si1066777eds.389.2020.08.20.03.21.19; Thu, 20 Aug 2020 03:21:20 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yvNAoiZ8; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730473AbgHTKVM (ORCPT + 15 others); Thu, 20 Aug 2020 06:21:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:47138 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731529AbgHTKVH (ORCPT ); Thu, 20 Aug 2020 06:21:07 -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 BEB5B20738; Thu, 20 Aug 2020 10:21:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597918866; bh=EHuWEAqef+MFu2ZDsYXQpvGQaTZJwqP5kF7KV4YBlUM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yvNAoiZ8s/JJPLiTJQvxHnPh/QdRPTuWC94gi6MmqXprV1kihJ6F5zf8G+e9eLzFn Hf+iyQ7NE9G0KxGwMxq3osgSvm9BJA3Y0cEdm9Zj9QgSYbmQ0GSI6cVXi24gcuGHIQ uldn+CfNoauKo2ZaEtyIrBVJoD87NdWtDV4jCMRU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Minas Harutyunyan , Marek Szyprowski , Felipe Balbi , Sasha Levin Subject: [PATCH 4.4 094/149] usb: dwc2: Fix error path in gadget registration Date: Thu, 20 Aug 2020 11:22:51 +0200 Message-Id: <20200820092130.275835519@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200820092125.688850368@linuxfoundation.org> References: <20200820092125.688850368@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marek Szyprowski [ Upstream commit 33a06f1300a79cfd461cea0268f05e969d4f34ec ] When gadget registration fails, one should not call usb_del_gadget_udc(). Ensure this by setting gadget->udc to NULL. Also in case of a failure there is no need to disable low-level hardware, so return immiedetly instead of jumping to error_init label. This fixes the following kernel NULL ptr dereference on gadget failure (can be easily triggered with g_mass_storage without any module parameters): dwc2 12480000.hsotg: dwc2_check_params: Invalid parameter besl=1 dwc2 12480000.hsotg: dwc2_check_params: Invalid parameter g_np_tx_fifo_size=1024 dwc2 12480000.hsotg: EPs: 16, dedicated fifos, 7808 entries in SPRAM Mass Storage Function, version: 2009/09/11 LUN: removable file: (no medium) no file given for LUN0 g_mass_storage 12480000.hsotg: failed to start g_mass_storage: -22 8<--- cut here --- Unable to handle kernel NULL pointer dereference at virtual address 00000104 pgd = (ptrval) [00000104] *pgd=00000000 Internal error: Oops: 805 [#1] PREEMPT SMP ARM Modules linked in: CPU: 0 PID: 12 Comm: kworker/0:1 Not tainted 5.8.0-rc5 #3133 Hardware name: Samsung Exynos (Flattened Device Tree) Workqueue: events deferred_probe_work_func PC is at usb_del_gadget_udc+0x38/0xc4 LR is at __mutex_lock+0x31c/0xb18 ... Process kworker/0:1 (pid: 12, stack limit = 0x(ptrval)) Stack: (0xef121db0 to 0xef122000) ... [] (usb_del_gadget_udc) from [] (dwc2_hsotg_remove+0x10/0x20) [] (dwc2_hsotg_remove) from [] (dwc2_driver_probe+0x57c/0x69c) [] (dwc2_driver_probe) from [] (platform_drv_probe+0x6c/0xa4) [] (platform_drv_probe) from [] (really_probe+0x200/0x48c) [] (really_probe) from [] (driver_probe_device+0x78/0x1fc) [] (driver_probe_device) from [] (bus_for_each_drv+0x74/0xb8) [] (bus_for_each_drv) from [] (__device_attach+0xd4/0x16c) [] (__device_attach) from [] (bus_probe_device+0x88/0x90) [] (bus_probe_device) from [] (deferred_probe_work_func+0x3c/0xd0) [] (deferred_probe_work_func) from [] (process_one_work+0x234/0x7dc) [] (process_one_work) from [] (worker_thread+0x44/0x51c) [] (worker_thread) from [] (kthread+0x158/0x1a0) [] (kthread) from [] (ret_from_fork+0x14/0x20) Exception stack(0xef121fb0 to 0xef121ff8) ... ---[ end trace 9724c2fc7cc9c982 ]--- While fixing this also fix the double call to dwc2_lowlevel_hw_disable() if dr_mode is set to USB_DR_MODE_PERIPHERAL. In such case low-level hardware is already disabled before calling usb_add_gadget_udc(). That function correctly preserves low-level hardware state, there is no need for the second unconditional dwc2_lowlevel_hw_disable() call. Fixes: 207324a321a8 ("usb: dwc2: Postponed gadget registration to the udc class driver") Acked-by: Minas Harutyunyan Signed-off-by: Marek Szyprowski Signed-off-by: Felipe Balbi Signed-off-by: Sasha Levin --- drivers/usb/dwc2/platform.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.25.1 diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c index 5e554b1d5a8f9..d9fafd6a7927f 100644 --- a/drivers/usb/dwc2/platform.c +++ b/drivers/usb/dwc2/platform.c @@ -458,6 +458,7 @@ static int dwc2_driver_probe(struct platform_device *dev) if (hsotg->gadget_enabled) { retval = usb_add_gadget_udc(hsotg->dev, &hsotg->gadget); if (retval) { + hsotg->gadget.udc = NULL; dwc2_hsotg_remove(hsotg); goto error; } @@ -466,7 +467,8 @@ static int dwc2_driver_probe(struct platform_device *dev) return 0; error: - dwc2_lowlevel_hw_disable(hsotg); + if (hsotg->dr_mode != USB_DR_MODE_PERIPHERAL) + dwc2_lowlevel_hw_disable(hsotg); return retval; }