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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 3E388C18E5C for ; Tue, 10 Mar 2020 13:18:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0968D24649 for ; Tue, 10 Mar 2020 13:18:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583846301; bh=V8sW1L2DUH/z4U3zVXfsxDO+qGRwv2AuKWrOLPt7x/o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jDK7FDNftrfUch423BPg1aRv5/JFADyF69lqQK4cTyHHh0aqKLER2E6X4i3oSaQ4G nY1r19qy+HZJRbDrwb7kG9jlbyl3t1S1IWigTDLpd2XXc8YElZjPA7H7hXL567wd7g qrhxpH4umPidO0kgnWkD2Fcol9Zx7meJlHFUike0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731368AbgCJNSK (ORCPT ); Tue, 10 Mar 2020 09:18:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:60578 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730876AbgCJNLB (ORCPT ); Tue, 10 Mar 2020 09:11:01 -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 0FF5824649; Tue, 10 Mar 2020 13:11:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583845861; bh=V8sW1L2DUH/z4U3zVXfsxDO+qGRwv2AuKWrOLPt7x/o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JL80NatpWPhqgHQ9zrMcxQhl3OOBH0XKUitH23HtonbEsT9Qz8mLWCyxgKS7MDU3l KlTEYBMfv9FxE34GvskJA+lgXu9Wt+FcVvJm109Dj3N793ZQNk/dXjm64r4DzMoi9w /NezjrzbAEZ9D6BTmpPpWmVvYn/Yd78Dgsb98c6o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Chen , Jack Pham , Mathias Nyman , Macpaul Lin Subject: [PATCH 4.14 126/126] xhci: handle port status events for removed USB3 hcd Date: Tue, 10 Mar 2020 13:42:27 +0100 Message-Id: <20200310124211.430808842@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200310124203.704193207@linuxfoundation.org> References: <20200310124203.704193207@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mathias Nyman commit 1245374e9b8340fc255fd51b2015173a83050d03 upstream. At xhci removal the USB3 hcd (shared_hcd) is removed before the primary USB2 hcd. Interrupts for port status changes may still occur for USB3 ports after the shared_hcd is freed, causing NULL pointer dereference. Check if xhci->shared_hcd is still valid before handing USB3 port events Cc: Reported-by: Peter Chen Tested-by: Jack Pham Signed-off-by: Mathias Nyman Cc: Macpaul Lin [redone for 4.14.y based on Mathias's comments] Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/xhci-ring.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -1640,6 +1640,12 @@ static void handle_port_status(struct xh 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",