From patchwork Fri Jan 17 07:41:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Macpaul Lin X-Patchwork-Id: 11338473 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 378D5109A for ; Fri, 17 Jan 2020 07:52:21 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1464F2073A for ; Fri, 17 Jan 2020 07:52:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="noLJt4mM"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="izdTNWFq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1464F2073A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=rtz9TjYcCLeEBQWO0qRj7Ywuo/qPHRai/K5i4LF9DUo=; b=noLJt4mMPAj5QN D1XJnJey7J4MySJlRDP4JRiLQwB2TY7Y4iryVwXVG3bv3AuBVLLKrRkwdo/rn68CfAZEfIhuBtq4k GogKeKa7q7l9H7iE4jrZaVumqM1HTiTrC0yIalSXLJ3ftb2URolQPDmegesBgN+kFklsUGPn4KhBd YPdCViD5k0UmGAaacyat7SL/81LG7nFUlS1CXIcIKmF7j52pbgQc5x81mV8wf0P0tjbbM+rDYtDYL JSPYUGSWXPcsN1eduzw5w3CvvAl3fSKxBKrmfQY4nBqqFxsfn7K2yTVPEluRghypvjA+Wk85QRmR8 S5BSSS+bbEYH3sFz9M3Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1isMQS-0002mA-NQ; Fri, 17 Jan 2020 07:52:16 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1isMQM-0002kz-NF; Fri, 17 Jan 2020 07:52:14 +0000 X-UUID: d1d56721978b4e04a2cab1b5c033353c-20200116 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID:Date:Subject:CC:To:From; bh=XlVHRJUiQa0Jm/lTprpguXiXjS3b7Bht7uRo2za199k=; b=izdTNWFqdjMNAZtC4TMrjRJqR7uydOUzTwPTMWwgbMNFRRdhKsruhxQ8XqwdwQ4H8QCQqE5VeuCoCE3HFk+Ph51sqchHrDhIXo1LRH24121x0aoe/J6YDu29INUT94yIJAtVCrgS7TCTgU4DcYzk5IvilT4rA7hFFswPLfzAvHA=; X-UUID: d1d56721978b4e04a2cab1b5c033353c-20200116 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 697601633; Thu, 16 Jan 2020 23:52:01 -0800 Received: from MTKMBS07N2.mediatek.inc (172.21.101.141) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Thu, 16 Jan 2020 23:42:05 -0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs07n2.mediatek.inc (172.21.101.141) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 17 Jan 2020 15:41:33 +0800 Received: from mtkswgap22.mediatek.inc (172.21.77.33) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Fri, 17 Jan 2020 15:41:10 +0800 From: Macpaul Lin To: Mathias Nyman , Greg Kroah-Hartman , Matthias Brugger , , , , , Chunfeng Yun Subject: [PATCH] xhci-mtk: Fix NULL pointer dereference with xhci_irq() for shared_hcd Date: Fri, 17 Jan 2020 15:41:50 +0800 Message-ID: <1579246910-22736-1-git-send-email-macpaul.lin@mediatek.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200116_235210_770096_5DFC517A X-CRM114-Status: GOOD ( 11.75 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 MIME_BASE64_TEXT RAW: Message text disguised using base64 encoding -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sriharsha Allenki , Macpaul Lin , Mediatek WSD Upstream Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org According to NULL pointer fix: https://tinyurl.com/uqft5ra xhci: Fix NULL pointer dereference with xhci_irq() for shared_hcd The similar issue has also been found in QC activities in Mediatek. Here quote the description from the referenced patch as follows. "Commit ("f068090426ea xhci: Fix leaking USB3 shared_hcd at xhci removal") sets xhci_shared_hcd to NULL without stopping xhci host. This results into a race condition where shared_hcd (super speed roothub) related interrupts are being handled with xhci_irq happens when the xhci_plat_remove is called and shared_hcd is set to NULL. Fix this by setting the shared_hcd to NULL only after the controller is halted and no interrupts are generated." Signed-off-by: Sriharsha Allenki Signed-off-by: Macpaul Lin --- drivers/usb/host/xhci-mtk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c index b18a6baef204..c227c67f5dc5 100644 --- a/drivers/usb/host/xhci-mtk.c +++ b/drivers/usb/host/xhci-mtk.c @@ -593,11 +593,11 @@ static int xhci_mtk_remove(struct platform_device *dev) struct usb_hcd *shared_hcd = xhci->shared_hcd; usb_remove_hcd(shared_hcd); - xhci->shared_hcd = NULL; device_init_wakeup(&dev->dev, false); usb_remove_hcd(hcd); usb_put_hcd(shared_hcd); + xhci->shared_hcd = NULL; usb_put_hcd(hcd); xhci_mtk_sch_exit(mtk); xhci_mtk_clks_disable(mtk);