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=-8.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED, USER_AGENT_SANE_2 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 C0222C3F2D1 for ; Thu, 5 Mar 2020 02:59:14 +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 9221920838 for ; Thu, 5 Mar 2020 02:59:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="LBNXNMin"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="bwi+QgHx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9221920838 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-mediatek-bounces+linux-mediatek=archiver.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:References:In-Reply-To: Date:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=leTpWNk3HQO6zMhJkjyw3SPL7VkWterMvVmiVwRQTDk=; b=LBNXNMinwVOoK9 RnJpvGw5fQeQGf1HWPdHTti0MjaeAiQ+NubhP7DqAiFs69b//x1KoKxatVWJ8Rm2gRAeAi6yA6jpK gwv/hSPESXiwcVlVi+rvmCK10Rimt/Gl75FDbKT9kRwuE5SPhlVjNUmiI2vr6pBCuAhxziqfEkD0S QUeFOLlSE9+9UQkZgfwPCZQbo8rE6ciB0ljrDc6pQfZOO0/YsGlXKyxUreHiaH87kRDA8z4RVmNXE GWgFsRk973TIo7oPx2s0qVDOHUbYIWx65OVhqTxaDytpHLNiKvh5mRlf62CAysNmqcpaJbasjf2G7 tQXDjw3CzMVLGxY+7JZw==; 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 1j9giz-0003f5-T6; Thu, 05 Mar 2020 02:59:01 +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 1j9gix-0003eE-5I; Thu, 05 Mar 2020 02:59:00 +0000 X-UUID: 85b47e1d05b84330ba36395ec32abdbd-20200304 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=F7PLKBwRKlNMHN+qvRx/poyq+GC8uN8Rdyl0q+FHkC0=; b=bwi+QgHxF7+70QzDd5pQu7Ulhi99aqe6bKZIC3LPK5wOMpI5ygbT2Xk4HKktgBf7kDZZxnda6/G9QDgP/eATXYNHDw2YK4I3Kdn9EgCvqkuQ6rt/+GafFyJ2xLXhmLeCfQrW/Uyr4ZUz/QhkEJ2ynhZA7xdDzQKMSXqoT0P4bJQ=; X-UUID: 85b47e1d05b84330ba36395ec32abdbd-20200304 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1686734397; Wed, 04 Mar 2020 18:58:50 -0800 Received: from MTKMBS07N2.mediatek.inc (172.21.101.141) by MTKMBS62N2.mediatek.inc (172.29.193.42) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 4 Mar 2020 18:59:06 -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; Thu, 5 Mar 2020 10:57:54 +0800 Received: from [172.21.77.33] (172.21.77.33) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Thu, 5 Mar 2020 10:58:02 +0800 Message-ID: <1583377126.12083.63.camel@mtkswgap22> Subject: Re: [PATCH] xhci-mtk: Fix NULL pointer dereference with xhci_irq() for shared_hcd From: Macpaul Lin To: Mathias Nyman Date: Thu, 5 Mar 2020 10:58:46 +0800 In-Reply-To: References: <1579246910-22736-1-git-send-email-macpaul.lin@mediatek.com> <08f69bab-2ada-d6ab-7bf7-d960e9f148a0@linux.intel.com> <1580556039.10835.3.camel@mtkswgap22> <39ec1610-1686-6509-02ac-6e73d8be2453@linux.intel.com> <1583291775.12083.59.camel@mtkswgap22> X-Mailer: Evolution 3.2.3-0ubuntu6 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200304_185859_216080_7A3B5230 X-CRM114-Status: GOOD ( 28.81 ) X-BeenThere: linux-mediatek@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 , wsd_upstream , Mathias Nyman , Greg Kroah-Hartman , "linux-usb@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Chunfeng Yun =?UTF-8?Q?=28=E4=BA=91=E6=98=A5=E5=B3=B0=29?= , "linux-mediatek@lists.infradead.org" , Matthias Brugger , "linux-arm-kernel@lists.infradead.org" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org On Wed, 2020-03-04 at 16:39 +0200, Mathias Nyman wrote: > On 4.3.2020 5.16, Macpaul Lin wrote: > > On Tue, 2020-02-04 at 17:44 +0800, Mathias Nyman wrote: > >> On 1.2.2020 13.20, Macpaul Lin wrote: > >>> On Fri, 2020-01-31 at 16:50 +0200, Mathias Nyman wrote: > >>>> On 17.1.2020 9.41, Macpaul Lin wrote: > >>>>> 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); > >>>>> > >>>> > >>>> Could you share details of the NULL pointer dereference, (backtrace). > >>> > >>> This bug was found by our QA staff while doing 500 times plug-in and > >>> plug-out devices. The backtrace I have was recorded by QA and I didn't > >>> reproduce this issue on my own environment. However, after applied this > >>> patch the issue seems resolve. Here is the backtrace: > >>> > >>> Exception Class: Kernel (KE) > >>> PC is at [] xhci_irq+0x728/0x2364 > >>> LR is at [] xhci_irq+0x2f0/0x2364 > >>> > >>> Current Executing Process: > >>> [iptables, 859][netdagent, 770] > >>> > >>> Backtrace: > >>> [] __atomic_notifier_call_chain+0xa8/0x130 > >>> [] notify_die+0x84/0xac > >>> [] die+0x1d8/0x3b8 > >>> [] __do_kernel_fault+0x178/0x188 > >>> [] do_page_fault+0x44/0x3b0 > >>> [] do_translation_fault+0x44/0x98 > >>> [] do_mem_abort+0x4c/0x128 > >>> [] el1_da+0x24/0x3c > >>> [] xhci_irq+0x728/0x2364 > >>> [] usb_hcd_irq+0x2c/0x44 > >>> [] __handle_irq_event_percpu+0x26c/0x4a4 > >>> [] handle_irq_event+0x5c/0xd0 > >>> [] handle_fasteoi_irq+0x10c/0x1e0 > >>> [] __handle_domain_irq+0x32c/0x738 > >>> [] gic_handle_irq+0x174/0x1c4 > >>> [] el0_irq_naked+0x50/0x5c > >>> [] 0xffffffffffffffff > >>> > >> > >> Thanks, > >> Could you help me find out which line of code xhci_irq+0x728 is in your case. > >> > >> As Guenter pointed out there is a risk of turning the NULL pointer dereference > >> into a use after free if we just solve this by setting xhci->shared_hcd = NULL > >> later. > >> > >> If you still have that kernel around, and xhci is compiled in: > >> gdb vmlinux > >> gdb li *(xhci_irq+0x728) > >> > > > > Sorry that I couldn't get back to you soon. The internal code version > > for this issue was really old and a little bit difficult to rewind to > > that version. > > However, I think the following dump might be correct for the code base. > > > > (gdb) li *(xhci_irq+0x728) > > 0xffffff8008cc8634 is in xhci_irq (*stripped* > > kernel-4.14/drivers/usb/host/xhci.h:1694). > > 1689 */ > > 1690 #define XHCI_MAX_REXIT_TIMEOUT_MS 20 > > 1691 > > 1692 static inline unsigned int hcd_index(struct usb_hcd *hcd) > > 1693 { > > 1694 if (hcd->speed >= HCD_USB3) > > 1695 return 0; > > 1696 else > > 1697 return 1; > > 1698 } > > (gdb) > > > > Thanks > > Macpaul Lin > > > > Ah, it was a 4.14 kernel. > This should be fixed in 4.20 with patch: > 1245374e9b83 xhci: handle port status events for removed USB3 hcd > > Port arrays/structures were changed completely in 4.18 > > Something like the below should work for 4.14: > > diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c > index 61fa3007a74a..e7367b9f19c5 100644 > --- a/drivers/usb/host/xhci-ring.c > +++ b/drivers/usb/host/xhci-ring.c > @@ -1640,6 +1640,12 @@ static void handle_port_status(struct xhci_hcd *xhci, > if ((major_revision == 0x03) != (hcd->speed >= HCD_USB3)) > hcd = xhci->shared_hcd; > > + if (!hcd) { > + xhci_dbg(xhci, "No hcd found for port %u event\n", port_id); > + bogus_port_status = true; > + goto cleanup; > + } > + > if (major_revision == 0) { > xhci_warn(xhci, "Event for port %u not in " > "Extended Capabilities, ignoring.\n", Thanks for this suggestion, this is much better! I am sorry that we're using android kernel that some reported issue might be out of date. I will update the suggestion into our code base. Thanks! Regards, Macpaul Lin _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek 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=-8.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED, USER_AGENT_SANE_2 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 5A199C3F2CE for ; Thu, 5 Mar 2020 02:58:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2221820838 for ; Thu, 5 Mar 2020 02:58:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="bwi+QgHx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725830AbgCEC64 (ORCPT ); Wed, 4 Mar 2020 21:58:56 -0500 Received: from mailgw01.mediatek.com ([210.61.82.183]:11905 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1725810AbgCEC6z (ORCPT ); Wed, 4 Mar 2020 21:58:55 -0500 X-UUID: 65600fd7992e4f2a941f1790c12fc5eb-20200305 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=F7PLKBwRKlNMHN+qvRx/poyq+GC8uN8Rdyl0q+FHkC0=; b=bwi+QgHxF7+70QzDd5pQu7Ulhi99aqe6bKZIC3LPK5wOMpI5ygbT2Xk4HKktgBf7kDZZxnda6/G9QDgP/eATXYNHDw2YK4I3Kdn9EgCvqkuQ6rt/+GafFyJ2xLXhmLeCfQrW/Uyr4ZUz/QhkEJ2ynhZA7xdDzQKMSXqoT0P4bJQ=; X-UUID: 65600fd7992e4f2a941f1790c12fc5eb-20200305 Received: from mtkcas08.mediatek.inc [(172.21.101.126)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 205886089; Thu, 05 Mar 2020 10:58:48 +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; Thu, 5 Mar 2020 10:57:54 +0800 Received: from [172.21.77.33] (172.21.77.33) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Thu, 5 Mar 2020 10:58:02 +0800 Message-ID: <1583377126.12083.63.camel@mtkswgap22> Subject: Re: [PATCH] xhci-mtk: Fix NULL pointer dereference with xhci_irq() for shared_hcd From: Macpaul Lin To: Mathias Nyman CC: Mathias Nyman , Greg Kroah-Hartman , Matthias Brugger , "linux-usb@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-mediatek@lists.infradead.org" , "linux-kernel@vger.kernel.org" , Chunfeng Yun =?UTF-8?Q?=28=E4=BA=91=E6=98=A5=E5=B3=B0=29?= , wsd_upstream , Sriharsha Allenki Date: Thu, 5 Mar 2020 10:58:46 +0800 In-Reply-To: References: <1579246910-22736-1-git-send-email-macpaul.lin@mediatek.com> <08f69bab-2ada-d6ab-7bf7-d960e9f148a0@linux.intel.com> <1580556039.10835.3.camel@mtkswgap22> <39ec1610-1686-6509-02ac-6e73d8be2453@linux.intel.com> <1583291775.12083.59.camel@mtkswgap22> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.3-0ubuntu6 MIME-Version: 1.0 X-MTK: N Content-Transfer-Encoding: base64 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org T24gV2VkLCAyMDIwLTAzLTA0IGF0IDE2OjM5ICswMjAwLCBNYXRoaWFzIE55bWFuIHdyb3RlOg0K PiBPbiA0LjMuMjAyMCA1LjE2LCBNYWNwYXVsIExpbiB3cm90ZToNCj4gPiBPbiBUdWUsIDIwMjAt MDItMDQgYXQgMTc6NDQgKzA4MDAsIE1hdGhpYXMgTnltYW4gd3JvdGU6DQo+ID4+IE9uIDEuMi4y MDIwIDEzLjIwLCBNYWNwYXVsIExpbiB3cm90ZToNCj4gPj4+IE9uIEZyaSwgMjAyMC0wMS0zMSBh dCAxNjo1MCArMDIwMCwgTWF0aGlhcyBOeW1hbiB3cm90ZToNCj4gPj4+PiBPbiAxNy4xLjIwMjAg OS40MSwgTWFjcGF1bCBMaW4gd3JvdGU6DQo+ID4+Pj4+IEFjY29yZGluZyB0byBOVUxMIHBvaW50 ZXIgZml4OiBodHRwczovL3Rpbnl1cmwuY29tL3VxZnQ1cmENCj4gPj4+Pj4geGhjaTogRml4IE5V TEwgcG9pbnRlciBkZXJlZmVyZW5jZSB3aXRoIHhoY2lfaXJxKCkgZm9yIHNoYXJlZF9oY2QNCj4g Pj4+Pj4gVGhlIHNpbWlsYXIgaXNzdWUgaGFzIGFsc28gYmVlbiBmb3VuZCBpbiBRQyBhY3Rpdml0 aWVzIGluIE1lZGlhdGVrLg0KPiA+Pj4+Pg0KPiA+Pj4+PiBIZXJlIHF1b3RlIHRoZSBkZXNjcmlw dGlvbiBmcm9tIHRoZSByZWZlcmVuY2VkIHBhdGNoIGFzIGZvbGxvd3MuDQo+ID4+Pj4+ICJDb21t aXQgKCJmMDY4MDkwNDI2ZWEgeGhjaTogRml4IGxlYWtpbmcgVVNCMyBzaGFyZWRfaGNkDQo+ID4+ Pj4+IGF0IHhoY2kgcmVtb3ZhbCIpIHNldHMgeGhjaV9zaGFyZWRfaGNkIHRvIE5VTEwgd2l0aG91 dA0KPiA+Pj4+PiBzdG9wcGluZyB4aGNpIGhvc3QuIFRoaXMgcmVzdWx0cyBpbnRvIGEgcmFjZSBj b25kaXRpb24NCj4gPj4+Pj4gd2hlcmUgc2hhcmVkX2hjZCAoc3VwZXIgc3BlZWQgcm9vdGh1Yikg cmVsYXRlZCBpbnRlcnJ1cHRzDQo+ID4+Pj4+IGFyZSBiZWluZyBoYW5kbGVkIHdpdGggeGhjaV9p cnEgaGFwcGVucyB3aGVuIHRoZQ0KPiA+Pj4+PiB4aGNpX3BsYXRfcmVtb3ZlIGlzIGNhbGxlZCBh bmQgc2hhcmVkX2hjZCBpcyBzZXQgdG8gTlVMTC4NCj4gPj4+Pj4gRml4IHRoaXMgYnkgc2V0dGlu ZyB0aGUgc2hhcmVkX2hjZCB0byBOVUxMIG9ubHkgYWZ0ZXIgdGhlDQo+ID4+Pj4+IGNvbnRyb2xs ZXIgaXMgaGFsdGVkIGFuZCBubyBpbnRlcnJ1cHRzIGFyZSBnZW5lcmF0ZWQuIg0KPiA+Pj4+Pg0K PiA+Pj4+PiBTaWduZWQtb2ZmLWJ5OiBTcmloYXJzaGEgQWxsZW5raSA8c2FsbGVua2lAY29kZWF1 cm9yYS5vcmc+DQo+ID4+Pj4+IFNpZ25lZC1vZmYtYnk6IE1hY3BhdWwgTGluIDxtYWNwYXVsLmxp bkBtZWRpYXRlay5jb20+DQo+ID4+Pj4+IC0tLQ0KPiA+Pj4+PiAgICBkcml2ZXJzL3VzYi9ob3N0 L3hoY2ktbXRrLmMgfCAyICstDQo+ID4+Pj4+ICAgIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlv bigrKSwgMSBkZWxldGlvbigtKQ0KPiA+Pj4+Pg0KPiA+Pj4+PiBkaWZmIC0tZ2l0IGEvZHJpdmVy cy91c2IvaG9zdC94aGNpLW10ay5jIGIvZHJpdmVycy91c2IvaG9zdC94aGNpLW10ay5jDQo+ID4+ Pj4+IGluZGV4IGIxOGE2YmFlZjIwNC4uYzIyN2M2N2Y1ZGM1IDEwMDY0NA0KPiA+Pj4+PiAtLS0g YS9kcml2ZXJzL3VzYi9ob3N0L3hoY2ktbXRrLmMNCj4gPj4+Pj4gKysrIGIvZHJpdmVycy91c2Iv aG9zdC94aGNpLW10ay5jDQo+ID4+Pj4+IEBAIC01OTMsMTEgKzU5MywxMSBAQCBzdGF0aWMgaW50 IHhoY2lfbXRrX3JlbW92ZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpkZXYpDQo+ID4+Pj4+ICAg IAlzdHJ1Y3QgdXNiX2hjZCAgKnNoYXJlZF9oY2QgPSB4aGNpLT5zaGFyZWRfaGNkOw0KPiA+Pj4+ PiAgICANCj4gPj4+Pj4gICAgCXVzYl9yZW1vdmVfaGNkKHNoYXJlZF9oY2QpOw0KPiA+Pj4+PiAt CXhoY2ktPnNoYXJlZF9oY2QgPSBOVUxMOw0KPiA+Pj4+PiAgICAJZGV2aWNlX2luaXRfd2FrZXVw KCZkZXYtPmRldiwgZmFsc2UpOw0KPiA+Pj4+PiAgICANCj4gPj4+Pj4gICAgCXVzYl9yZW1vdmVf aGNkKGhjZCk7DQo+ID4+Pj4+ICAgIAl1c2JfcHV0X2hjZChzaGFyZWRfaGNkKTsNCj4gPj4+Pj4g Kwl4aGNpLT5zaGFyZWRfaGNkID0gTlVMTDsNCj4gPj4+Pj4gICAgCXVzYl9wdXRfaGNkKGhjZCk7 DQo+ID4+Pj4+ICAgIAl4aGNpX210a19zY2hfZXhpdChtdGspOw0KPiA+Pj4+PiAgICAJeGhjaV9t dGtfY2xrc19kaXNhYmxlKG10ayk7DQo+ID4+Pj4+DQo+ID4+Pj4NCj4gPj4+PiBDb3VsZCB5b3Ug c2hhcmUgZGV0YWlscyBvZiB0aGUgTlVMTCBwb2ludGVyIGRlcmVmZXJlbmNlLCAoYmFja3RyYWNl KS4NCj4gPj4+DQo+ID4+PiBUaGlzIGJ1ZyB3YXMgZm91bmQgYnkgb3VyIFFBIHN0YWZmIHdoaWxl IGRvaW5nIDUwMCB0aW1lcyBwbHVnLWluIGFuZA0KPiA+Pj4gcGx1Zy1vdXQgZGV2aWNlcy4gVGhl IGJhY2t0cmFjZSBJIGhhdmUgd2FzIHJlY29yZGVkIGJ5IFFBIGFuZCBJIGRpZG4ndA0KPiA+Pj4g cmVwcm9kdWNlIHRoaXMgaXNzdWUgb24gbXkgb3duIGVudmlyb25tZW50LiBIb3dldmVyLCBhZnRl ciBhcHBsaWVkIHRoaXMNCj4gPj4+IHBhdGNoIHRoZSBpc3N1ZSBzZWVtcyByZXNvbHZlLiBIZXJl IGlzIHRoZSBiYWNrdHJhY2U6DQo+ID4+Pg0KPiA+Pj4gRXhjZXB0aW9uIENsYXNzOiBLZXJuZWwg KEtFKQ0KPiA+Pj4gUEMgaXMgYXQgWzxmZmZmZmY4MDA4Y2NjYmMwPl0geGhjaV9pcnErMHg3Mjgv MHgyMzY0DQo+ID4+PiBMUiBpcyBhdCBbPGZmZmZmZjgwMDhjY2M3ODg+XSB4aGNpX2lycSsweDJm MC8weDIzNjQNCj4gPj4+DQo+ID4+PiBDdXJyZW50IEV4ZWN1dGluZyBQcm9jZXNzOg0KPiA+Pj4g W2lwdGFibGVzLCA4NTldW25ldGRhZ2VudCwgNzcwXQ0KPiA+Pj4NCj4gPj4+IEJhY2t0cmFjZToN Cj4gPj4+IFs8ZmZmZmZmODAwODBlYWQ1OD5dIF9fYXRvbWljX25vdGlmaWVyX2NhbGxfY2hhaW4r MHhhOC8weDEzMA0KPiA+Pj4gWzxmZmZmZmY4MDA4MGViNmQ0Pl0gbm90aWZ5X2RpZSsweDg0LzB4 YWMNCj4gPj4+IFs8ZmZmZmZmODAwODA4ZTg3ND5dIGRpZSsweDFkOC8weDNiOA0KPiA+Pj4gWzxm ZmZmZmY4MDA4MGE4OWIwPl0gX19kb19rZXJuZWxfZmF1bHQrMHgxNzgvMHgxODgNCj4gPj4+IFs8 ZmZmZmZmODAwODBhODFiND5dIGRvX3BhZ2VfZmF1bHQrMHg0NC8weDNiMA0KPiA+Pj4gWzxmZmZm ZmY4MDA4MGE4MTFjPl0gZG9fdHJhbnNsYXRpb25fZmF1bHQrMHg0NC8weDk4DQo+ID4+PiBbPGZm ZmZmZjgwMDgwODBlMDg+XSBkb19tZW1fYWJvcnQrMHg0Yy8weDEyOA0KPiA+Pj4gWzxmZmZmZmY4 MDA4MDgzMmQwPl0gZWwxX2RhKzB4MjQvMHgzYw0KPiA+Pj4gWzxmZmZmZmY4MDA4Y2NjYmMwPl0g eGhjaV9pcnErMHg3MjgvMHgyMzY0DQo+ID4+PiBbPGZmZmZmZjgwMDhjOTg4MDQ+XSB1c2JfaGNk X2lycSsweDJjLzB4NDQNCj4gPj4+IFs8ZmZmZmZmODAwODE3OWJiMD5dIF9faGFuZGxlX2lycV9l dmVudF9wZXJjcHUrMHgyNmMvMHg0YTQNCj4gPj4+IFs8ZmZmZmZmODAwODE3OWVjOD5dIGhhbmRs ZV9pcnFfZXZlbnQrMHg1Yy8weGQwDQo+ID4+PiBbPGZmZmZmZjgwMDgxN2UzYzA+XSBoYW5kbGVf ZmFzdGVvaV9pcnErMHgxMGMvMHgxZTANCj4gPj4+IFs8ZmZmZmZmODAwODE3ODdiMD5dIF9faGFu ZGxlX2RvbWFpbl9pcnErMHgzMmMvMHg3MzgNCj4gPj4+IFs8ZmZmZmZmODAwODA4MTU5Yz5dIGdp Y19oYW5kbGVfaXJxKzB4MTc0LzB4MWM0DQo+ID4+PiBbPGZmZmZmZjgwMDgwODNjZjg+XSBlbDBf aXJxX25ha2VkKzB4NTAvMHg1Yw0KPiA+Pj4gWzxmZmZmZmZmZmZmZmZmZmZmPl0gMHhmZmZmZmZm ZmZmZmZmZmZmDQo+ID4+Pg0KPiA+Pg0KPiA+PiBUaGFua3MsDQo+ID4+IENvdWxkIHlvdSBoZWxw IG1lIGZpbmQgb3V0IHdoaWNoIGxpbmUgb2YgY29kZSB4aGNpX2lycSsweDcyOCBpcyBpbiB5b3Vy IGNhc2UuDQo+ID4+DQo+ID4+IEFzIEd1ZW50ZXIgcG9pbnRlZCBvdXQgdGhlcmUgaXMgYSByaXNr IG9mIHR1cm5pbmcgdGhlIE5VTEwgcG9pbnRlciBkZXJlZmVyZW5jZQ0KPiA+PiBpbnRvIGEgdXNl IGFmdGVyIGZyZWUgaWYgd2UganVzdCBzb2x2ZSB0aGlzIGJ5IHNldHRpbmcgeGhjaS0+c2hhcmVk X2hjZCA9IE5VTEwNCj4gPj4gbGF0ZXIuDQo+ID4+DQo+ID4+IElmIHlvdSBzdGlsbCBoYXZlIHRo YXQga2VybmVsIGFyb3VuZCwgYW5kIHhoY2kgaXMgY29tcGlsZWQgaW46DQo+ID4+IGdkYiB2bWxp bnV4DQo+ID4+IGdkYiBsaSAqKHhoY2lfaXJxKzB4NzI4KQ0KPiA+Pg0KPiA+IA0KPiA+IFNvcnJ5 IHRoYXQgSSBjb3VsZG4ndCBnZXQgYmFjayB0byB5b3Ugc29vbi4gVGhlIGludGVybmFsIGNvZGUg dmVyc2lvbg0KPiA+IGZvciB0aGlzIGlzc3VlIHdhcyByZWFsbHkgb2xkIGFuZCBhIGxpdHRsZSBi aXQgZGlmZmljdWx0IHRvIHJld2luZCB0bw0KPiA+IHRoYXQgdmVyc2lvbi4NCj4gPiBIb3dldmVy LCBJIHRoaW5rIHRoZSBmb2xsb3dpbmcgZHVtcCBtaWdodCBiZSBjb3JyZWN0IGZvciB0aGUgY29k ZSBiYXNlLg0KPiA+IA0KPiA+IChnZGIpIGxpICooeGhjaV9pcnErMHg3MjgpDQo+ID4gMHhmZmZm ZmY4MDA4Y2M4NjM0IGlzIGluIHhoY2lfaXJxICgqc3RyaXBwZWQqDQo+ID4ga2VybmVsLTQuMTQv ZHJpdmVycy91c2IvaG9zdC94aGNpLmg6MTY5NCkuDQo+ID4gMTY4OSAgICAgKi8NCj4gPiAxNjkw ICAgICNkZWZpbmUgWEhDSV9NQVhfUkVYSVRfVElNRU9VVF9NUyAgICAgICAyMA0KPiA+IDE2OTEN Cj4gPiAxNjkyICAgIHN0YXRpYyBpbmxpbmUgdW5zaWduZWQgaW50IGhjZF9pbmRleChzdHJ1Y3Qg dXNiX2hjZCAqaGNkKQ0KPiA+IDE2OTMgICAgew0KPiA+IDE2OTQgICAgICAgICAgICBpZiAoaGNk LT5zcGVlZCA+PSBIQ0RfVVNCMykNCj4gPiAxNjk1ICAgICAgICAgICAgICAgICAgICByZXR1cm4g MDsNCj4gPiAxNjk2ICAgICAgICAgICAgZWxzZQ0KPiA+IDE2OTcgICAgICAgICAgICAgICAgICAg IHJldHVybiAxOw0KPiA+IDE2OTggICAgfQ0KPiA+IChnZGIpDQo+ID4gDQo+ID4gVGhhbmtzDQo+ ID4gTWFjcGF1bCBMaW4NCj4gPiANCj4gDQo+IEFoLCBpdCB3YXMgYSA0LjE0IGtlcm5lbC4NCj4g VGhpcyBzaG91bGQgYmUgZml4ZWQgaW4gNC4yMCB3aXRoIHBhdGNoOg0KPiAxMjQ1Mzc0ZTliODMg eGhjaTogaGFuZGxlIHBvcnQgc3RhdHVzIGV2ZW50cyBmb3IgcmVtb3ZlZCBVU0IzIGhjZA0KPiAN Cj4gUG9ydCBhcnJheXMvc3RydWN0dXJlcyB3ZXJlIGNoYW5nZWQgY29tcGxldGVseSBpbiA0LjE4 DQo+IA0KPiBTb21ldGhpbmcgbGlrZSB0aGUgYmVsb3cgc2hvdWxkIHdvcmsgZm9yIDQuMTQ6DQo+ IA0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvaG9zdC94aGNpLXJpbmcuYyBiL2RyaXZlcnMv dXNiL2hvc3QveGhjaS1yaW5nLmMNCj4gaW5kZXggNjFmYTMwMDdhNzRhLi5lNzM2N2I5ZjE5YzUg MTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvdXNiL2hvc3QveGhjaS1yaW5nLmMNCj4gKysrIGIvZHJp dmVycy91c2IvaG9zdC94aGNpLXJpbmcuYw0KPiBAQCAtMTY0MCw2ICsxNjQwLDEyIEBAIHN0YXRp YyB2b2lkIGhhbmRsZV9wb3J0X3N0YXR1cyhzdHJ1Y3QgeGhjaV9oY2QgKnhoY2ksDQo+ICAJaWYg KChtYWpvcl9yZXZpc2lvbiA9PSAweDAzKSAhPSAoaGNkLT5zcGVlZCA+PSBIQ0RfVVNCMykpDQo+ ICAJCWhjZCA9IHhoY2ktPnNoYXJlZF9oY2Q7DQo+ICANCj4gKwlpZiAoIWhjZCkgew0KPiArCQl4 aGNpX2RiZyh4aGNpLCAiTm8gaGNkIGZvdW5kIGZvciBwb3J0ICV1IGV2ZW50XG4iLCBwb3J0X2lk KTsNCj4gKwkJYm9ndXNfcG9ydF9zdGF0dXMgPSB0cnVlOw0KPiArCQlnb3RvIGNsZWFudXA7DQo+ ICsJfQ0KPiArDQo+ICAJaWYgKG1ham9yX3JldmlzaW9uID09IDApIHsNCj4gIAkJeGhjaV93YXJu KHhoY2ksICJFdmVudCBmb3IgcG9ydCAldSBub3QgaW4gIg0KPiAgCQkJCSJFeHRlbmRlZCBDYXBh YmlsaXRpZXMsIGlnbm9yaW5nLlxuIiwNCg0KVGhhbmtzIGZvciB0aGlzIHN1Z2dlc3Rpb24sIHRo aXMgaXMgbXVjaCBiZXR0ZXIhIEkgYW0gc29ycnkgdGhhdCB3ZSdyZQ0KdXNpbmcgYW5kcm9pZCBr ZXJuZWwgdGhhdCBzb21lIHJlcG9ydGVkIGlzc3VlIG1pZ2h0IGJlIG91dCBvZiBkYXRlLiBJDQp3 aWxsIHVwZGF0ZSB0aGUgc3VnZ2VzdGlvbiBpbnRvIG91ciBjb2RlIGJhc2UuIFRoYW5rcyENCg0K UmVnYXJkcywNCk1hY3BhdWwgTGluDQoNCg== 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=-8.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED, USER_AGENT_SANE_2 autolearn=ham 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 F1F02C3F2CE for ; Thu, 5 Mar 2020 02:59:03 +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 C41A920838 for ; Thu, 5 Mar 2020 02:59:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="t99+IdU7"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="bwi+QgHx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C41A920838 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+infradead-linux-arm-kernel=archiver.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:References:In-Reply-To: Date:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=V1WkRho7eHc3FUjM616pZa2mEo4nyA0EXCMG+EZ7OxM=; b=t99+IdU7dZxPIU QWmQXRKN2oi+MJiTqGLO6V9cfmkjDZetKHH6oEeFDCW6yqaX2aHveMGV6UrLtZ6vOc6iX0zkNAy03 tKE1xX3qkn60/wSVARM8WZFG7BheVf7PgX+OkNo7PmQiX6em1cJeTU8f2lO5/Evo9+6pwJVid6vBJ lZAhmHAKzloHgLaavHonCVT5/QrFeUsJckZIrLFjxxPlEVJdwqFSMk3GQBZUukYw746dcNs6PuNWD JwDkSiO8LbNu5jXgpP8HzOV/EEntNdJZvVnccXQZZXzEJb0IrEcGvvccH5XmUVe0ev+77lN3e/Hh4 mtdynperJLJ91qEwpnXw==; 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 1j9gj1-0003gJ-7v; Thu, 05 Mar 2020 02:59:03 +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 1j9gix-0003eE-5I; Thu, 05 Mar 2020 02:59:00 +0000 X-UUID: 85b47e1d05b84330ba36395ec32abdbd-20200304 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=F7PLKBwRKlNMHN+qvRx/poyq+GC8uN8Rdyl0q+FHkC0=; b=bwi+QgHxF7+70QzDd5pQu7Ulhi99aqe6bKZIC3LPK5wOMpI5ygbT2Xk4HKktgBf7kDZZxnda6/G9QDgP/eATXYNHDw2YK4I3Kdn9EgCvqkuQ6rt/+GafFyJ2xLXhmLeCfQrW/Uyr4ZUz/QhkEJ2ynhZA7xdDzQKMSXqoT0P4bJQ=; X-UUID: 85b47e1d05b84330ba36395ec32abdbd-20200304 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1686734397; Wed, 04 Mar 2020 18:58:50 -0800 Received: from MTKMBS07N2.mediatek.inc (172.21.101.141) by MTKMBS62N2.mediatek.inc (172.29.193.42) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 4 Mar 2020 18:59:06 -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; Thu, 5 Mar 2020 10:57:54 +0800 Received: from [172.21.77.33] (172.21.77.33) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Thu, 5 Mar 2020 10:58:02 +0800 Message-ID: <1583377126.12083.63.camel@mtkswgap22> Subject: Re: [PATCH] xhci-mtk: Fix NULL pointer dereference with xhci_irq() for shared_hcd From: Macpaul Lin To: Mathias Nyman Date: Thu, 5 Mar 2020 10:58:46 +0800 In-Reply-To: References: <1579246910-22736-1-git-send-email-macpaul.lin@mediatek.com> <08f69bab-2ada-d6ab-7bf7-d960e9f148a0@linux.intel.com> <1580556039.10835.3.camel@mtkswgap22> <39ec1610-1686-6509-02ac-6e73d8be2453@linux.intel.com> <1583291775.12083.59.camel@mtkswgap22> X-Mailer: Evolution 3.2.3-0ubuntu6 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200304_185859_216080_7A3B5230 X-CRM114-Status: GOOD ( 28.81 ) 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 , wsd_upstream , Mathias Nyman , Greg Kroah-Hartman , "linux-usb@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Chunfeng Yun =?UTF-8?Q?=28=E4=BA=91=E6=98=A5=E5=B3=B0=29?= , "linux-mediatek@lists.infradead.org" , Matthias Brugger , "linux-arm-kernel@lists.infradead.org" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, 2020-03-04 at 16:39 +0200, Mathias Nyman wrote: > On 4.3.2020 5.16, Macpaul Lin wrote: > > On Tue, 2020-02-04 at 17:44 +0800, Mathias Nyman wrote: > >> On 1.2.2020 13.20, Macpaul Lin wrote: > >>> On Fri, 2020-01-31 at 16:50 +0200, Mathias Nyman wrote: > >>>> On 17.1.2020 9.41, Macpaul Lin wrote: > >>>>> 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); > >>>>> > >>>> > >>>> Could you share details of the NULL pointer dereference, (backtrace). > >>> > >>> This bug was found by our QA staff while doing 500 times plug-in and > >>> plug-out devices. The backtrace I have was recorded by QA and I didn't > >>> reproduce this issue on my own environment. However, after applied this > >>> patch the issue seems resolve. Here is the backtrace: > >>> > >>> Exception Class: Kernel (KE) > >>> PC is at [] xhci_irq+0x728/0x2364 > >>> LR is at [] xhci_irq+0x2f0/0x2364 > >>> > >>> Current Executing Process: > >>> [iptables, 859][netdagent, 770] > >>> > >>> Backtrace: > >>> [] __atomic_notifier_call_chain+0xa8/0x130 > >>> [] notify_die+0x84/0xac > >>> [] die+0x1d8/0x3b8 > >>> [] __do_kernel_fault+0x178/0x188 > >>> [] do_page_fault+0x44/0x3b0 > >>> [] do_translation_fault+0x44/0x98 > >>> [] do_mem_abort+0x4c/0x128 > >>> [] el1_da+0x24/0x3c > >>> [] xhci_irq+0x728/0x2364 > >>> [] usb_hcd_irq+0x2c/0x44 > >>> [] __handle_irq_event_percpu+0x26c/0x4a4 > >>> [] handle_irq_event+0x5c/0xd0 > >>> [] handle_fasteoi_irq+0x10c/0x1e0 > >>> [] __handle_domain_irq+0x32c/0x738 > >>> [] gic_handle_irq+0x174/0x1c4 > >>> [] el0_irq_naked+0x50/0x5c > >>> [] 0xffffffffffffffff > >>> > >> > >> Thanks, > >> Could you help me find out which line of code xhci_irq+0x728 is in your case. > >> > >> As Guenter pointed out there is a risk of turning the NULL pointer dereference > >> into a use after free if we just solve this by setting xhci->shared_hcd = NULL > >> later. > >> > >> If you still have that kernel around, and xhci is compiled in: > >> gdb vmlinux > >> gdb li *(xhci_irq+0x728) > >> > > > > Sorry that I couldn't get back to you soon. The internal code version > > for this issue was really old and a little bit difficult to rewind to > > that version. > > However, I think the following dump might be correct for the code base. > > > > (gdb) li *(xhci_irq+0x728) > > 0xffffff8008cc8634 is in xhci_irq (*stripped* > > kernel-4.14/drivers/usb/host/xhci.h:1694). > > 1689 */ > > 1690 #define XHCI_MAX_REXIT_TIMEOUT_MS 20 > > 1691 > > 1692 static inline unsigned int hcd_index(struct usb_hcd *hcd) > > 1693 { > > 1694 if (hcd->speed >= HCD_USB3) > > 1695 return 0; > > 1696 else > > 1697 return 1; > > 1698 } > > (gdb) > > > > Thanks > > Macpaul Lin > > > > Ah, it was a 4.14 kernel. > This should be fixed in 4.20 with patch: > 1245374e9b83 xhci: handle port status events for removed USB3 hcd > > Port arrays/structures were changed completely in 4.18 > > Something like the below should work for 4.14: > > diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c > index 61fa3007a74a..e7367b9f19c5 100644 > --- a/drivers/usb/host/xhci-ring.c > +++ b/drivers/usb/host/xhci-ring.c > @@ -1640,6 +1640,12 @@ static void handle_port_status(struct xhci_hcd *xhci, > if ((major_revision == 0x03) != (hcd->speed >= HCD_USB3)) > hcd = xhci->shared_hcd; > > + if (!hcd) { > + xhci_dbg(xhci, "No hcd found for port %u event\n", port_id); > + bogus_port_status = true; > + goto cleanup; > + } > + > if (major_revision == 0) { > xhci_warn(xhci, "Event for port %u not in " > "Extended Capabilities, ignoring.\n", Thanks for this suggestion, this is much better! I am sorry that we're using android kernel that some reported issue might be out of date. I will update the suggestion into our code base. Thanks! Regards, Macpaul Lin _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel