Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2532037imu; Thu, 29 Nov 2018 06:30:04 -0800 (PST) X-Google-Smtp-Source: AFSGD/UYl7N+Bwx5VgEpgWYz3Dqv5MsRoX8aH5LjgK5fH+Dfwg2nXDsB+M71KhIMYrk0fNY/tyMM X-Received: by 2002:a63:64c:: with SMTP id 73mr1400146pgg.373.1543501804098; Thu, 29 Nov 2018 06:30:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543501804; cv=none; d=google.com; s=arc-20160816; b=ABP3yg4+tTZu0/ryQyuEysVQ2H9IT4WA2bTn/LB6FghXCW2x7NgmKTLlimD/emMGF3 C6UNpDzKOcv94uDAKa/dsSB6/CpEc3jUb5bly2cuS3IExfbutiKfds5RDCdOMAyG6A/D TbtZk+vxAUlcsQsJcPgbngcsrW7M0mHOyxEl0erOI1cBCridtrezKqqE03BKOEc3pYrU 3ZtSmFWs0Bj93qAOiqx2rlXouqrZi8j5OHvPJtjkJQoMfJpFzu2HL9CFJlZxlgMQRxNM GO4+j57WGgch0EzNKpighGcdXgjke1quRn9ZCtzA4IIAIUElqH3iU6jCFljsZ3zCoa/e hQyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tcnkqBcZ7lAVMu7+XJP4QKxw1uOiYDD3akSPiwZSyl0=; b=o7Aurs8SCXWe84nWO31wO3DUNBixJJVbJCzWq3BPArL7OlXg8SfNNcE10ngyT+R4ss +5To+ZOrkAgQb42CRQDuFrknlxVx5gRIpX/9LZI0orXXjkW9GJsxK9r9LarycJKUn3i9 zl/fP1xHi+Iuy++3HOM7Ax+GVjaW0xqL/1awFXTo6HeX+0xjcdkCtlvkEE8LBVn844XM NnetkNWd9CbdtlwaGsh4PG3GJIlRr1zMjH3crHImg2iyIYOm+eRSP+WsVQbJ2vOUtkVa 4tZfkQxICfhAqCZjqX8K332hutdAA68Xo7VUHMn5fFwPAL8uiSnsjDinlBqdhwKvdjvS eosA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zlzcHlFT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v6si2039972pgv.277.2018.11.29.06.29.48; Thu, 29 Nov 2018 06:30:04 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zlzcHlFT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388288AbeK3Bee (ORCPT + 99 others); Thu, 29 Nov 2018 20:34:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:35846 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731995AbeK3Bed (ORCPT ); Thu, 29 Nov 2018 20:34:33 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 7BCAA2146D; Thu, 29 Nov 2018 14:29:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1543501740; bh=29enooqc2sWuci1d33hdARvzsXd+ubESPVazKVv5Nvc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zlzcHlFTFfW5tZyqZS4/bo2AEiIF+P56FhHhDeBU+0Nsve06VNNPNUOykd3fd+KcW ULfYsjqCIHDpD+WNyXE1cozh+YCHu8+OOf7yZmS+3oiH8X5+zgm+pZU+I78UBuYytW cQssG7Mx2pQb7eqPsfum+7Oiwrl++YwVNTtXujzk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kuppuswamy Sathyanarayanan , Heikki Krogerus , Felipe Balbi Subject: [PATCH 4.19 007/110] usb: dwc3: Fix NULL pointer exception in dwc3_pci_remove() Date: Thu, 29 Nov 2018 15:11:38 +0100 Message-Id: <20181129135921.537632380@linuxfoundation.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181129135921.231283053@linuxfoundation.org> References: <20181129135921.231283053@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kuppuswamy Sathyanarayanan commit 7b412b04a0c7000293008231ce8413056abb1982 upstream. In dwc3_pci_quirks() function, gpiod lookup table is only registered for baytrail SOC. But in dwc3_pci_remove(), we try to unregistered it without any checks. This leads to NULL pointer de-reference exception in gpiod_remove_lookup_table() when unloading the module for non baytrail SOCs. This patch fixes this issue. Fixes: 5741022cbdf3 ("usb: dwc3: pci: Add GPIO lookup table on platforms without ACPI GPIO resources") Cc: Signed-off-by: Kuppuswamy Sathyanarayanan Reviewed-by: Heikki Krogerus Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman --- drivers/usb/dwc3/dwc3-pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/usb/dwc3/dwc3-pci.c +++ b/drivers/usb/dwc3/dwc3-pci.c @@ -283,8 +283,10 @@ err: static void dwc3_pci_remove(struct pci_dev *pci) { struct dwc3_pci *dwc = pci_get_drvdata(pci); + struct pci_dev *pdev = dwc->pci; - gpiod_remove_lookup_table(&platform_bytcr_gpios); + if (pdev->device == PCI_DEVICE_ID_INTEL_BYT) + gpiod_remove_lookup_table(&platform_bytcr_gpios); #ifdef CONFIG_PM cancel_work_sync(&dwc->wakeup_work); #endif