linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] PCI: keystone: Don't dereference possible NULL pointer
@ 2015-04-09 19:45 Bjorn Helgaas
  2015-04-27 16:12 ` Murali Karicheri
  0 siblings, 1 reply; 2+ messages in thread
From: Bjorn Helgaas @ 2015-04-09 19:45 UTC (permalink / raw)
  To: Murali Karicheri; +Cc: linux-pci

Check for failure from platform_get_resource() (this check actually happens
inside devm_ioremap_resource()) before dereferencing the pointer returned
from platform_get_resource().

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
 drivers/pci/host/pci-keystone-dw.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/host/pci-keystone-dw.c b/drivers/pci/host/pci-keystone-dw.c
index 66d8ea41b972..f34892e0edb4 100644
--- a/drivers/pci/host/pci-keystone-dw.c
+++ b/drivers/pci/host/pci-keystone-dw.c
@@ -496,11 +496,12 @@ int __init ks_dw_pcie_host_init(struct keystone_pcie *ks_pcie,
 
 	/* Index 1 is the application reg. space address */
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-	ks_pcie->app = *res;
 	ks_pcie->va_app_base = devm_ioremap_resource(pp->dev, res);
 	if (IS_ERR(ks_pcie->va_app_base))
 		return PTR_ERR(ks_pcie->va_app_base);
 
+	ks_pcie->app = *res;
+
 	/* Create legacy IRQ domain */
 	ks_pcie->legacy_irq_domain =
 			irq_domain_add_linear(ks_pcie->legacy_intc_np,


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] PCI: keystone: Don't dereference possible NULL pointer
  2015-04-09 19:45 [PATCH] PCI: keystone: Don't dereference possible NULL pointer Bjorn Helgaas
@ 2015-04-27 16:12 ` Murali Karicheri
  0 siblings, 0 replies; 2+ messages in thread
From: Murali Karicheri @ 2015-04-27 16:12 UTC (permalink / raw)
  To: Bjorn Helgaas; +Cc: linux-pci

On 04/09/2015 03:45 PM, Bjorn Helgaas wrote:
> Check for failure from platform_get_resource() (this check actually happens
> inside devm_ioremap_resource()) before dereferencing the pointer returned
> from platform_get_resource().
>
> Signed-off-by: Bjorn Helgaas<bhelgaas@google.com>
> ---
>   drivers/pci/host/pci-keystone-dw.c |    3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pci/host/pci-keystone-dw.c b/drivers/pci/host/pci-keystone-dw.c
> index 66d8ea41b972..f34892e0edb4 100644
> --- a/drivers/pci/host/pci-keystone-dw.c
> +++ b/drivers/pci/host/pci-keystone-dw.c
> @@ -496,11 +496,12 @@ int __init ks_dw_pcie_host_init(struct keystone_pcie *ks_pcie,
>
>   	/* Index 1 is the application reg. space address */
>   	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
> -	ks_pcie->app = *res;
>   	ks_pcie->va_app_base = devm_ioremap_resource(pp->dev, res);
>   	if (IS_ERR(ks_pcie->va_app_base))
>   		return PTR_ERR(ks_pcie->va_app_base);
>
> +	ks_pcie->app = *res;
> +
>   	/* Create legacy IRQ domain */
>   	ks_pcie->legacy_irq_domain =
>   			irq_domain_add_linear(ks_pcie->legacy_intc_np,
>
Bjorn,

Thanks for fixing this.

Acked-By: Murali Karicheri <m-karicheri2@ti.com>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-04-27 16:12 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-09 19:45 [PATCH] PCI: keystone: Don't dereference possible NULL pointer Bjorn Helgaas
2015-04-27 16:12 ` Murali Karicheri

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).