From patchwork Tue Oct 25 13:42:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 9394547 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4074E60762 for ; Tue, 25 Oct 2016 13:43:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3370F294FD for ; Tue, 25 Oct 2016 13:43:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2803329521; Tue, 25 Oct 2016 13:43:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E443B294FD for ; Tue, 25 Oct 2016 13:43:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934082AbcJYNnQ (ORCPT ); Tue, 25 Oct 2016 09:43:16 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:37828 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932845AbcJYNnQ (ORCPT ); Tue, 25 Oct 2016 09:43:16 -0400 Received: by mail-wm0-f51.google.com with SMTP id c78so25315307wme.0 for ; Tue, 25 Oct 2016 06:43:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=k98M4hgoucujcD5BBpZqM2y/1bnNhApR7RXtpBsEOf4=; b=AymOzhD+6WJr7Usc3m0osYOEcOcttQXj/nUYCOXdUmb8fFyccVR+s0pHpI5cOLts+c Jgw3bGhSSPnCd2b+A6lo3OOXhQjR3Bhbk6SzJRwjEYf5VPh35XOmVxeyseODrLZ19zLO KgX2phMRnHBskZ9qCUtP//C8uI0QH0qhGWkRE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=k98M4hgoucujcD5BBpZqM2y/1bnNhApR7RXtpBsEOf4=; b=lGsm4RCjVTQ4Rrbh2BunFmNEXl80EKlS0MKvDKT/KFwlflgSIgwGsrY/yMnLtwNw+b pRwI6h9k+8OFfpCxPVFvZHnvNlkjGdKYCc0Lw/vsLeegosuFQZTZLrgFzhOpS9Sxnu4X Szghm5y/PFzBJKky7bVBCxVwB00YTkde1NHgowfG+56S4KMcPkeAWAy1U/b/zFFoB8Mo c8oqpjawRa9WJONxGXdaxmzBpBNDw2Pl5C8ycvwU622jdPFv/M3QfdYU8zYzd8eauQlj cQ5/0Ef9a5jlfQq5E1OrMmi0jlifJHvpCag0JHrRYtp5stx8hEyl0fGa34nqR6XEnoaf Rq6A== X-Gm-Message-State: ABUngveQSIO17isTGgWfODh5axdgPSUSyWNj5NFJ045uYIX/AQ44mv8zxSzxUr0+648AuGuH X-Received: by 10.28.222.70 with SMTP id v67mr3222471wmg.84.1477402994445; Tue, 25 Oct 2016 06:43:14 -0700 (PDT) Received: from localhost.localdomain (host-2-98-102-117.as13285.net. [2.98.102.117]) by smtp.gmail.com with ESMTPSA id 18sm3791538wmr.6.2016.10.25.06.43.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Oct 2016 06:43:13 -0700 (PDT) From: Srinivas Kandagatla To: svarbanov@mm-sol.com, bhelgaas@google.com Cc: linux-pci@vger.kernel.org, linux-arm-msm@vger.kernel.org, srinivas.kandagatla@linaro.org Subject: [PATCH] PCI: qcom: fix NULL pointer dereference in get_resources() Date: Tue, 25 Oct 2016 14:42:51 +0100 Message-Id: <1477402971-22146-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP get_resources() will dereference dev as NULL pointer when called from probe(), as pp.dev is only assigned after get_resources() is called. Fix this by moving dev pointer assignment before get_resources() call. Signed-off-by: Srinivas Kandagatla Fixes: e6a087eeaf91 ("PCI: qcom: Remove redundant struct qcom_pcie.dev") --- drivers/pci/host/pcie-qcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/host/pcie-qcom.c b/drivers/pci/host/pcie-qcom.c index ef0a84c..3593640 100644 --- a/drivers/pci/host/pcie-qcom.c +++ b/drivers/pci/host/pcie-qcom.c @@ -533,11 +533,11 @@ static int qcom_pcie_probe(struct platform_device *pdev) if (IS_ERR(pcie->phy)) return PTR_ERR(pcie->phy); + pp->dev = dev; ret = pcie->ops->get_resources(pcie); if (ret) return ret; - pp->dev = dev; pp->root_bus_nr = -1; pp->ops = &qcom_pcie_dw_ops;