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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 69C51ECAAA1 for ; Tue, 6 Sep 2022 13:38:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232969AbiIFNiX (ORCPT ); Tue, 6 Sep 2022 09:38:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240583AbiIFNhr (ORCPT ); Tue, 6 Sep 2022 09:37:47 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39C4D192A1; Tue, 6 Sep 2022 06:34:44 -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 37B90B818B9; Tue, 6 Sep 2022 13:34:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D5B11C433B5; Tue, 6 Sep 2022 13:34:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1662471274; bh=6l2h6tEWieDy9VbQJENH+//y+eN03VQbe7BVZg/7znE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J3BZP4lhqXi8plsN81LmyRD5YeWwMJ+JW3hycNL28MJryZ5qojLc/YZ2DIwlYP476 3qwFDmuCLVx2ORSM0QBd+/Kouh7BZCjx7lLXDxokjhIUlfGTWMCLyrH5XI/mWtia5R g0T/bqkh/IKFCGLeI+bt8fAL4RMha2A6lo5GmxepSkFSIfmv7pLGl5/R/bx2CSBPLw hu+42HzXZIIQiEfax2UxY80RfFssf5vqUTtGNoeppexA23FtMKHfyPO2Ij11gqrIiY TPp2FmXzii4HU9WkXCwCI5fXpFWXMQNI0incI/dS6YmU9Kod12obdkA1VzlC7saGnx 62SLg8MA2vRlQ== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1oVYit-0006sx-4j; Tue, 06 Sep 2022 15:34:39 +0200 From: Johan Hovold To: Greg Kroah-Hartman Cc: stable@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , Matthias Kaehlcke , Manivannan Sadhasivam , Johan Hovold Subject: [PATCH stable-5.4 1/3] usb: dwc3: qcom: fix use-after-free on runtime-PM wakeup Date: Tue, 6 Sep 2022 15:34:33 +0200 Message-Id: <20220906133435.26452-2-johan@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220906133435.26452-1-johan@kernel.org> References: <20220906133435.26452-1-johan@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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 --- drivers/usb/dwc3/dwc3-qcom.c | 14 +++++++++++++- drivers/usb/dwc3/host.c | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c index 7874b97e3322..aed35276e0e0 100644 --- a/drivers/usb/dwc3/dwc3-qcom.c +++ b/drivers/usb/dwc3/dwc3-qcom.c @@ -190,6 +190,14 @@ static int dwc3_qcom_register_extcon(struct dwc3_qcom *qcom) 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) { @@ -297,7 +305,11 @@ static irqreturn_t qcom_dwc3_resume_irq(int irq, void *data) 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; diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c index fa252870c926..38bcb079ffc7 100644 --- a/drivers/usb/dwc3/host.c +++ b/drivers/usb/dwc3/host.c @@ -128,4 +128,5 @@ int dwc3_host_init(struct dwc3 *dwc) void dwc3_host_exit(struct dwc3 *dwc) { platform_device_unregister(dwc->xhci); + dwc->xhci = NULL; } -- 2.35.1