* [PATCH] PCI: imx6: Fix a "Null pointer dereference" issue
@ 2024-09-11 12:50 Qianqiang Liu
2024-09-11 14:16 ` Bjorn Helgaas
0 siblings, 1 reply; 3+ messages in thread
From: Qianqiang Liu @ 2024-09-11 12:50 UTC (permalink / raw)
To: hongxing.zhu, l.stach, shawnguo, s.hauer
Cc: linux-pci, imx, linux-kernel, Qianqiang Liu
The "resource_list_first_type" function may return NULL, which
will make "entry->offset" dereferences a NULL pointer.
Signed-off-by: Qianqiang Liu <qianqiang.liu@163.com>
---
drivers/pci/controller/dwc/pci-imx6.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index 0dbc333adcff..04e90ba4e7d6 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -1017,13 +1017,14 @@ static u64 imx_pcie_cpu_addr_fixup(struct dw_pcie *pcie, u64 cpu_addr)
struct imx_pcie *imx_pcie = to_imx_pcie(pcie);
struct dw_pcie_rp *pp = &pcie->pp;
struct resource_entry *entry;
- unsigned int offset;
+ unsigned int offset = 0;
if (!(imx_pcie->drvdata->flags & IMX_PCIE_FLAG_CPU_ADDR_FIXUP))
return cpu_addr;
entry = resource_list_first_type(&pp->bridge->windows, IORESOURCE_MEM);
- offset = entry->offset;
+ if (entry)
+ offset = entry->offset;
return (cpu_addr - offset);
}
--
2.39.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] PCI: imx6: Fix a "Null pointer dereference" issue
2024-09-11 12:50 [PATCH] PCI: imx6: Fix a "Null pointer dereference" issue Qianqiang Liu
@ 2024-09-11 14:16 ` Bjorn Helgaas
2024-09-11 15:21 ` Frank Li
0 siblings, 1 reply; 3+ messages in thread
From: Bjorn Helgaas @ 2024-09-11 14:16 UTC (permalink / raw)
To: Qianqiang Liu
Cc: hongxing.zhu, l.stach, shawnguo, s.hauer, linux-pci, imx,
linux-kernel
On Wed, Sep 11, 2024 at 08:50:57PM +0800, Qianqiang Liu wrote:
> The "resource_list_first_type" function may return NULL, which
> will make "entry->offset" dereferences a NULL pointer.
>
> Signed-off-by: Qianqiang Liu <qianqiang.liu@163.com>
> ---
> drivers/pci/controller/dwc/pci-imx6.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
> index 0dbc333adcff..04e90ba4e7d6 100644
> --- a/drivers/pci/controller/dwc/pci-imx6.c
> +++ b/drivers/pci/controller/dwc/pci-imx6.c
> @@ -1017,13 +1017,14 @@ static u64 imx_pcie_cpu_addr_fixup(struct dw_pcie *pcie, u64 cpu_addr)
> struct imx_pcie *imx_pcie = to_imx_pcie(pcie);
> struct dw_pcie_rp *pp = &pcie->pp;
> struct resource_entry *entry;
> - unsigned int offset;
> + unsigned int offset = 0;
>
> if (!(imx_pcie->drvdata->flags & IMX_PCIE_FLAG_CPU_ADDR_FIXUP))
> return cpu_addr;
>
> entry = resource_list_first_type(&pp->bridge->windows, IORESOURCE_MEM);
> - offset = entry->offset;
> + if (entry)
> + offset = entry->offset;
>
> return (cpu_addr - offset);
> }
I made the edit I proposed here:
https://lore.kernel.org/r/20240911140721.GA630378@bhelgaas
Please double-check it at:
https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git/commit/?id=c2699778e6be
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] PCI: imx6: Fix a "Null pointer dereference" issue
2024-09-11 14:16 ` Bjorn Helgaas
@ 2024-09-11 15:21 ` Frank Li
0 siblings, 0 replies; 3+ messages in thread
From: Frank Li @ 2024-09-11 15:21 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: Qianqiang Liu, hongxing.zhu, l.stach, shawnguo, s.hauer,
linux-pci, imx, linux-kernel
On Wed, Sep 11, 2024 at 09:16:58AM -0500, Bjorn Helgaas wrote:
> On Wed, Sep 11, 2024 at 08:50:57PM +0800, Qianqiang Liu wrote:
> > The "resource_list_first_type" function may return NULL, which
> > will make "entry->offset" dereferences a NULL pointer.
> >
> > Signed-off-by: Qianqiang Liu <qianqiang.liu@163.com>
> > ---
> > drivers/pci/controller/dwc/pci-imx6.c | 5 +++--
> > 1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
> > index 0dbc333adcff..04e90ba4e7d6 100644
> > --- a/drivers/pci/controller/dwc/pci-imx6.c
> > +++ b/drivers/pci/controller/dwc/pci-imx6.c
> > @@ -1017,13 +1017,14 @@ static u64 imx_pcie_cpu_addr_fixup(struct dw_pcie *pcie, u64 cpu_addr)
> > struct imx_pcie *imx_pcie = to_imx_pcie(pcie);
> > struct dw_pcie_rp *pp = &pcie->pp;
> > struct resource_entry *entry;
> > - unsigned int offset;
> > + unsigned int offset = 0;
> >
> > if (!(imx_pcie->drvdata->flags & IMX_PCIE_FLAG_CPU_ADDR_FIXUP))
> > return cpu_addr;
> >
> > entry = resource_list_first_type(&pp->bridge->windows, IORESOURCE_MEM);
> > - offset = entry->offset;
> > + if (entry)
> > + offset = entry->offset;
> >
> > return (cpu_addr - offset);
> > }
>
> I made the edit I proposed here:
> https://lore.kernel.org/r/20240911140721.GA630378@bhelgaas
>
> Please double-check it at:
> https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git/commit/?id=c2699778e6be
It is good.
Frank
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-09-11 15:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-11 12:50 [PATCH] PCI: imx6: Fix a "Null pointer dereference" issue Qianqiang Liu
2024-09-11 14:16 ` Bjorn Helgaas
2024-09-11 15:21 ` Frank Li
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox