2015-06-29 10:36:00

by Maninder Singh

Subject: [PATCH 1/1] cxl/vphb.c: Use phb pointer after NULL check

static Anlaysis detected below error:-
(error) Possible null pointer dereference: phb

So, Use phb after NULL check.

Signed-off-by: Maninder Singh <[email protected]>
---
drivers/misc/cxl/vphb.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/misc/cxl/vphb.c b/drivers/misc/cxl/vphb.c
index b1d1983a..2eba002 100644
--- a/drivers/misc/cxl/vphb.c
+++ b/drivers/misc/cxl/vphb.c
@@ -112,9 +112,10 @@ static int cxl_pcie_config_info(struct pci_bus *bus, unsigned int devfn,
unsigned long addr;

phb = pci_bus_to_host(bus);
- afu = (struct cxl_afu *)phb->private_data;
if (phb == NULL)
return PCIBIOS_DEVICE_NOT_FOUND;
+ afu = (struct cxl_afu *)phb->private_data;
+
if (cxl_pcie_cfg_record(bus->number, devfn) > afu->crs_num)
return PCIBIOS_DEVICE_NOT_FOUND;
if (offset >= (unsigned long)phb->cfg_data)
--
1.7.9.5

2015-06-29 10:43:46

by Michael Neuling

Subject: Re: [PATCH 1/1] cxl/vphb.c: Use phb pointer after NULL check

On Mon, 2015-06-29 at 16:05 +0530, Maninder Singh wrote:
> static Anlaysis detected below error:-
> (error) Possible null pointer dereference: phb
>
> So, Use phb after NULL check.
>
> Signed-off-by: Maninder Singh <[email protected]>

Thanks, looks good.

Acked-By: Michael Neuling <[email protected]>

> ---
> drivers/misc/cxl/vphb.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/misc/cxl/vphb.c b/drivers/misc/cxl/vphb.c
> index b1d1983a..2eba002 100644
> --- a/drivers/misc/cxl/vphb.c
> +++ b/drivers/misc/cxl/vphb.c
> @@ -112,9 +112,10 @@ static int cxl_pcie_config_info(struct pci_bus *bus, unsigned int devfn,
> unsigned long addr;
>
> phb = pci_bus_to_host(bus);
> - afu = (struct cxl_afu *)phb->private_data;
> if (phb == NULL)
> return PCIBIOS_DEVICE_NOT_FOUND;
> + afu = (struct cxl_afu *)phb->private_data;
> +
> if (cxl_pcie_cfg_record(bus->number, devfn) > afu->crs_num)
> return PCIBIOS_DEVICE_NOT_FOUND;
> if (offset >= (unsigned long)phb->cfg_data)

2015-06-30 03:28:11

by Ian Munsie

Subject: Re: [PATCH 1/1] cxl/vphb.c: Use phb pointer after NULL check

Acked-by: Ian Munsie <[email protected]>

2015-07-07 10:38:13

by Michael Ellerman

Subject: Re: [1/1] cxl/vphb.c: Use phb pointer after NULL check

On Mon, 2015-29-06 at 10:35:11 UTC, Maninder Singh wrote:
> static Anlaysis detected below error:-
> (error) Possible null pointer dereference: phb
>
> So, Use phb after NULL check.
>
> Signed-off-by: Maninder Singh <[email protected]>
> Acked-by: Ian Munsie <[email protected]>

Applied to powerpc fixes, thanks.

https://git.kernel.org/cgit/linux/kernel/git/powerpc/linux.git/commit/?h=fixes&id=14f21189df33bc972455d6a0ed875aa68718d7fc

cheers