Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH] media: cobalt: fix null-ptr-deref when there is no PCI
 bridge
To:     Tong Zhang <ztong0001@gmail.com>,
        Mauro Carvalho Chehab <mchehab@kernel.org>,
        linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
References: <20210424005206.261622-1-ztong0001@gmail.com>
From:   Hans Verkuil <hverkuil-cisco@xs4all.nl>
Message-ID: <b84e0b87-4753-0513-9803-0cda4ceb4adc@xs4all.nl>
Date:   Wed, 5 May 2021 11:18:14 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Firefox/78.0 Thunderbird/78.9.0
MIME-Version: 1.0
In-Reply-To: <20210424005206.261622-1-ztong0001@gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 24/04/2021 02:52, Tong Zhang wrote:
> the PCI bridge might be NULL, so we'd better check before use it
> 
> [    1.870569] RIP: 0010:pcie_bus_link_get_lanes.isra.0+0x26/0x59 [cobalt]
> [    1.875880] Call Trace:
> [    1.876013]  cobalt_probe.cold+0x1be/0xc11 [cobalt]
> [    1.876683]  pci_device_probe+0x10f/0x1c0

How did you test this? With some virtualized PCI bus or something? I'm not sure
how this can happen.

Regards,

	Hans

> 
> Signed-off-by: Tong Zhang <ztong0001@gmail.com>
> ---
>  drivers/media/pci/cobalt/cobalt-driver.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/media/pci/cobalt/cobalt-driver.c b/drivers/media/pci/cobalt/cobalt-driver.c
> index 0695078ef812..5687ed4869ac 100644
> --- a/drivers/media/pci/cobalt/cobalt-driver.c
> +++ b/drivers/media/pci/cobalt/cobalt-driver.c
> @@ -189,6 +189,8 @@ void cobalt_pcie_status_show(struct cobalt *cobalt)
>  	u32 capa;
>  	u16 stat, ctrl;
>  
> +	if (!pci_bus_dev)
> +		return;
>  	if (!pci_is_pcie(pci_dev) || !pci_is_pcie(pci_bus_dev))
>  		return;
>  
> @@ -247,6 +249,8 @@ static unsigned pcie_bus_link_get_lanes(struct cobalt *cobalt)
>  	struct pci_dev *pci_dev = cobalt->pci_dev->bus->self;
>  	u32 link;
>  
> +	if (!pci_dev)
> +		return 0;
>  	if (!pci_is_pcie(pci_dev))
>  		return 0;
>  	pcie_capability_read_dword(pci_dev, PCI_EXP_LNKCAP, &link);
>