From patchwork Tue Jan 31 18:22:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 9547985 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 9AEC160425 for ; Tue, 31 Jan 2017 18:22:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8B5AE28285 for ; Tue, 31 Jan 2017 18:22:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 803B828384; Tue, 31 Jan 2017 18:22:44 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 D281B28285 for ; Tue, 31 Jan 2017 18:22:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751880AbdAaSWj (ORCPT ); Tue, 31 Jan 2017 13:22:39 -0500 Received: from mail.kernel.org ([198.145.29.136]:54084 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751417AbdAaSWg (ORCPT ); Tue, 31 Jan 2017 13:22:36 -0500 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8B48A2020F; Tue, 31 Jan 2017 18:22:34 +0000 (UTC) Received: from localhost (unknown [69.55.156.165]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2F8E220204; Tue, 31 Jan 2017 18:22:33 +0000 (UTC) Date: Tue, 31 Jan 2017 12:22:32 -0600 From: Bjorn Helgaas To: Shailendra Verma Cc: Zhou Wang , Gabriele Paoloni , Bjorn Helgaas , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, p.shailesh@samsung.com, ashish.kalra@samsung.com, Shailendra Verma Subject: Re: [PATCH] Pci: host - Fix possible NULL derefrence. Message-ID: <20170131182232.GA18672@bhelgaas-glaptop.roam.corp.google.com> References: <1485751775-29126-1-git-send-email-shailendra.v@samsung.com> <20170131150900.GB9942@bhelgaas-glaptop.roam.corp.google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20170131150900.GB9942@bhelgaas-glaptop.roam.corp.google.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Virus-Scanned: ClamAV using ClamSMTP 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 On Tue, Jan 31, 2017 at 09:09:00AM -0600, Bjorn Helgaas wrote: > Hi Shailendra, > > On Mon, Jan 30, 2017 at 10:19:35AM +0530, Shailendra Verma wrote: > > of_match_device could return NULL, and so can cause a NULL > > pointer dereference later. > > > > Signed-off-by: Shailendra Verma > > --- > > drivers/pci/host/pcie-hisi.c | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/drivers/pci/host/pcie-hisi.c b/drivers/pci/host/pcie-hisi.c > > index 56154c2..3256f8f 100644 > > --- a/drivers/pci/host/pcie-hisi.c > > +++ b/drivers/pci/host/pcie-hisi.c > > @@ -174,6 +174,10 @@ static int hisi_pcie_probe(struct platform_device *pdev) > > driver = dev->driver; > > > > match = of_match_device(driver->of_match_table, dev); > > + if (!match) { > > + dev_err(dev, "Error: No device match found\n"); > > + return -ENODEV; > > + } > > hisi_pcie->soc_ops = (struct pcie_soc_ops *) match->data; > > > > hisi_pcie->subctrl = > > I like this patch and I think it's correct. I'd like an ack from Zhou > and/or Gabriele, and I'd propose the following tweak, which just moves the > check earlier, before we start allocating this: Geert pointed out in a similar case that it's actually impossible for match to be NULL here because the only way to call hisi_pcie_probe() is to match an entry in hisi_pcie_of_match[]. So I think the following patch is even better because it removes a mention of driver->of_match_table. I can't easily build test to be sure, but I think the cast is also unnecessary. commit 806d19760e48166505818d4efafbdfbad5810989 Author: Shailendra Verma Date: Mon Jan 30 10:19:35 2017 +0530 PCI: hisi: Use of_device_get_match_data() to simplify probe The only way to call hisi_pcie_probe() is to match an entry in hisi_pcie_of_match[], so match cannot be NULL. Use of_device_get_match_data() to retrieve the soc_ops pointer. No functional change intended. [bhelgaas: use of_device_get_match_data(), changelog] Based-on-suggestion-from: Geert Uytterhoeven Signed-off-by: Shailendra Verma Signed-off-by: Bjorn Helgaas --- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/pci/host/pcie-hisi.c b/drivers/pci/host/pcie-hisi.c index a301a7187b30..34d10d242225 100644 --- a/drivers/pci/host/pcie-hisi.c +++ b/drivers/pci/host/pcie-hisi.c @@ -259,7 +259,6 @@ static int hisi_pcie_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct hisi_pcie *hisi_pcie; struct pcie_port *pp; - const struct of_device_id *match; struct resource *reg; struct device_driver *driver; int ret; @@ -272,11 +271,10 @@ static int hisi_pcie_probe(struct platform_device *pdev) pp->dev = dev; driver = dev->driver; - match = of_match_device(driver->of_match_table, dev); - hisi_pcie->soc_ops = (struct pcie_soc_ops *) match->data; + hisi_pcie->soc_ops = of_device_get_match_data(dev); hisi_pcie->subctrl = - syscon_regmap_lookup_by_compatible("hisilicon,pcie-sas-subctrl"); + syscon_regmap_lookup_by_compatible("hisilicon,pcie-sas-subctrl"); if (IS_ERR(hisi_pcie->subctrl)) { dev_err(dev, "cannot get subctrl base\n"); return PTR_ERR(hisi_pcie->subctrl);