Received: by 2002:a05:6358:489b:b0:bb:da1:e618 with SMTP id x27csp6829258rwn; Tue, 13 Sep 2022 09:31:26 -0700 (PDT) X-Google-Smtp-Source: AA6agR79uq8eWeDc/SKEh6UVb8fSZla4X9k2WqXdCLtc9OzK4wHwclr8PaGbmbynYBzWLxD+a8Qh X-Received: by 2002:a05:6402:440c:b0:43a:1124:e56a with SMTP id y12-20020a056402440c00b0043a1124e56amr27660567eda.134.1663086686543; Tue, 13 Sep 2022 09:31:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663086686; cv=none; d=google.com; s=arc-20160816; b=hLdMgve9CjXkI8scYO0FvE4+ertDTH3V2JIBWPnM+qo36GZIHtap4ll05OPnxcJrAW aLrpfgE1tUOO+XjqcQBx5yRbD7LtI3yTXC9sB0yXJxA1dfjZxDJrjtVOKqVl4BYyYlEi fkwZZyWkavOgclrTZHemBY4hxA5UE+t2IQVAwO62hfCiie8vp32cDeyZLjOzQo3hZn93 sKVeusiSVSV/rwQOIrjd+4xuX7FMOml/fXgC5MbplofZOxe/RtdjoUbV2q/BKPQbcUSg EyywS3qyIFEdfAOA+tqCpYoClMmuIyPCiuQPiTfm99g4BXPVScOiqaBLtO2hC1vfznbP Mezw== 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=sKMND8OOOqYBxA5+lluOq9L+RTUH/+GJZRAeCpdAJ10=; b=tszVJuzb0APD3TMyIoIeTG8FFsKws0Cc4EjfD9apOcrrRGtD+gz8H0zbdB/Kbk80S/ um0NmIaUTAtfH+1/iWIX7Ky4+idQzCOcBea+Gxp1Ywd7SpAU5H8UNNyYBIy7Z49QnII5 FoF3WlSfE14Vxo05mZeEv2ThN6clsxHkPQvdzq5CEk8gwHEFBLQBzSLx+kYbtqoERuDr 7GSEPN5uuQM242Mgr0YPcdZVmdKOTtkpFV44r7b6S3NBfYESf331XdbzEyHZMHorwecu MRu7VmABaL+EH0DCpJueu69rLdJOke16OdHczoT4eGMrj0X1XS8CUGYQ2NTNROcf3gOK +qmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hEGcNpHH; 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 hd44-20020a17090796ac00b007307c356ccesi11345306ejc.720.2022.09.13.09.30.56; Tue, 13 Sep 2022 09:31:26 -0700 (PDT) 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=hEGcNpHH; 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 S236533AbiIMPco (ORCPT + 99 others); Tue, 13 Sep 2022 11:32:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236508AbiIMPb6 (ORCPT ); Tue, 13 Sep 2022 11:31:58 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98B687E820; Tue, 13 Sep 2022 07:40:36 -0700 (PDT) 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 ams.source.kernel.org (Postfix) with ESMTPS id 93BE3B80F6F; Tue, 13 Sep 2022 14:33:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C465FC433C1; Tue, 13 Sep 2022 14:33:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663079585; bh=QVUIIIchCxxeuUgwWdiExksNAQBR6e7xgJ2M8dTQg50=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hEGcNpHHRuXatl3hTBnqi53B16yleG8ua70/oD1toP4s3qBTu+ZEiZjHHDaBlZOY/ 4epYEqPRWho0Tsjtm8XiZS7xxCSrCm6OlFztT1UHe6objRyM2cPkSwFtIJdj65Lcj8 DBhZm/HEmr6KgAmMYQI9hfZIIvsVDJUuwJWd7izU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Matthias Kaehlcke , Manivannan Sadhasivam , Johan Hovold , Johan Hovold Subject: [PATCH 4.19 76/79] usb: dwc3: qcom: fix use-after-free on runtime-PM wakeup Date: Tue, 13 Sep 2022 16:07:34 +0200 Message-Id: <20220913140352.554689442@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220913140348.835121645@linuxfoundation.org> References: <20220913140348.835121645@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 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: Johan Hovold From: Johan Hovold commit a872ab303d5ddd4c965f9cd868677781a33ce35a upstream. The Qualcomm dwc3 runtime-PM implementation checks the xhci platform-device pointer in the wakeup-interrupt handler to determine whether the controller is in host mode and if so triggers a resume. After a role switch in OTG mode the xhci platform-device would have been freed and the next wakeup from runtime suspend would access the freed memory. Note that role switching is executed from a freezable workqueue, which guarantees that the pointer is stable during suspend. Also note that runtime PM has been broken since commit 2664deb09306 ("usb: dwc3: qcom: Honor wakeup enabled/disabled state"), which incidentally also prevents this issue from being triggered. Fixes: a4333c3a6ba9 ("usb: dwc3: Add Qualcomm DWC3 glue driver") Cc: stable@vger.kernel.org # 4.18 Reviewed-by: Matthias Kaehlcke Reviewed-by: Manivannan Sadhasivam Signed-off-by: Johan Hovold Link: https://lore.kernel.org/r/20220804151001.23612-5-johan+linaro@kernel.org Signed-off-by: Greg Kroah-Hartman [ johan: adjust context for 5.4 ] Signed-off-by: Johan Hovold Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman --- drivers/usb/dwc3/dwc3-qcom.c | 14 +++++++++++++- drivers/usb/dwc3/host.c | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) --- a/drivers/usb/dwc3/dwc3-qcom.c +++ b/drivers/usb/dwc3/dwc3-qcom.c @@ -173,6 +173,14 @@ static int dwc3_qcom_register_extcon(str return 0; } +/* Only usable in contexts where the role can not change. */ +static bool dwc3_qcom_is_host(struct dwc3_qcom *qcom) +{ + struct dwc3 *dwc = platform_get_drvdata(qcom->dwc3); + + return dwc->xhci; +} + static void dwc3_qcom_disable_interrupts(struct dwc3_qcom *qcom) { if (qcom->hs_phy_irq) { @@ -280,7 +288,11 @@ static irqreturn_t qcom_dwc3_resume_irq( if (qcom->pm_suspended) return IRQ_HANDLED; - if (dwc->xhci) + /* + * This is safe as role switching is done from a freezable workqueue + * and the wakeup interrupts are disabled as part of resume. + */ + if (dwc3_qcom_is_host(qcom)) pm_runtime_resume(&dwc->xhci->dev); return IRQ_HANDLED; --- a/drivers/usb/dwc3/host.c +++ b/drivers/usb/dwc3/host.c @@ -142,4 +142,5 @@ void dwc3_host_exit(struct dwc3 *dwc) phy_remove_lookup(dwc->usb3_generic_phy, "usb3-phy", dev_name(dwc->dev)); platform_device_unregister(dwc->xhci); + dwc->xhci = NULL; }