[PATCH] vdpa/sfc: fix null pointer dereference

[PATCH] vdpa/sfc: fix null pointer dereference

[Weiguo Li]

When sva is null, sfc_vdpa_info(sva, ...) will cause a null
dereference. Use SFC_VDPA_GENERIC_LOG() to avoid that.
See macros sfc_vdpa_info and SFC_VDPA_GENERIC_LOG
defined in drivers/vdpa/sfc/sfc_vdpa_log.h for detail.

Fixes: 5e7596ba7cb3 ("vdpa/sfc: introduce Xilinx vDPA driver")

Signed-off-by: Weiguo Li <liwg06@foxmail.com>
---
 drivers/vdpa/sfc/sfc_vdpa.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
index fccdd8c687..53f598facc 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.c
+++ b/drivers/vdpa/sfc/sfc_vdpa.c
@@ -328,7 +328,8 @@ sfc_vdpa_pci_remove(struct rte_pci_device *pci_dev)
 
 	sva = sfc_vdpa_get_adapter_by_dev(pci_dev);
 	if (sva == NULL) {
-		sfc_vdpa_info(sva, "invalid device: %s", pci_dev->name);
+		SFC_VDPA_GENERIC_LOG(INFO,
+			"Invalid device: %s.", pci_dev->name);
 		return -1;
 	}
 
-- 
2.25.1

RE:[PATCH] vdpa/sfc: fix null pointer dereference

[Weiguo Li]

The macro sfc_vdpa_info(sva, ...) will invoke sva->logtype_main, 
It'll trigger a NULL dereference when sva is NULL.

This patch fix it.

BTW this patch is not superseded by another one:
 [v2] vdpa/sfc: fix null dereference
 (http://dpdk.org/patch/106720)

They looks alike in title, but deal with different files.

Please don't tag me as superseded again :)

Re: [PATCH] vdpa/sfc: fix null pointer dereference

[Maxime Coquelin]

Hi,

On 2/4/22 12:56, Weiguo Li wrote:
> The macro sfc_vdpa_info(sva, ...) will invoke sva->logtype_main,
> It'll trigger a NULL dereference when sva is NULL.
> 
> This patch fix it.
> 
> BTW this patch is not superseded by another one:
>   [v2] vdpa/sfc: fix null dereference
>   (http://dpdk.org/patch/106720)
> 
> They looks alike in title, but deal with different files.
> 
> Please don't tag me as superseded again :)
> 

Got it, having commit titles being more specific would help to avoid
that! :)

Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

Thanks,
Maxime

Re: [PATCH] vdpa/sfc: fix null pointer dereference

[Maxime Coquelin]

On 1/29/22 18:30, Weiguo Li wrote:
> When sva is null, sfc_vdpa_info(sva, ...) will cause a null
> dereference. Use SFC_VDPA_GENERIC_LOG() to avoid that.
> See macros sfc_vdpa_info and SFC_VDPA_GENERIC_LOG
> defined in drivers/vdpa/sfc/sfc_vdpa_log.h for detail.
> 
> Fixes: 5e7596ba7cb3 ("vdpa/sfc: introduce Xilinx vDPA driver")
> 
> Signed-off-by: Weiguo Li <liwg06@foxmail.com>
> ---
>   drivers/vdpa/sfc/sfc_vdpa.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
> index fccdd8c687..53f598facc 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa.c
> +++ b/drivers/vdpa/sfc/sfc_vdpa.c
> @@ -328,7 +328,8 @@ sfc_vdpa_pci_remove(struct rte_pci_device *pci_dev)
>   
>   	sva = sfc_vdpa_get_adapter_by_dev(pci_dev);
>   	if (sva == NULL) {
> -		sfc_vdpa_info(sva, "invalid device: %s", pci_dev->name);
> +		SFC_VDPA_GENERIC_LOG(INFO,
> +			"Invalid device: %s.", pci_dev->name);
>   		return -1;
>   	}
>   

Applied to dpdk-next-virtio/main, with rewording the title and cc'ing
stable.

Thanks,
Maxime

Re: [PATCH] vdpa/sfc: fix null pointer dereference

[Maxime Coquelin]

On 1/29/22 18:30, Weiguo Li wrote:
> When sva is null, sfc_vdpa_info(sva, ...) will cause a null
> dereference. Use SFC_VDPA_GENERIC_LOG() to avoid that.
> See macros sfc_vdpa_info and SFC_VDPA_GENERIC_LOG
> defined in drivers/vdpa/sfc/sfc_vdpa_log.h for detail.
> 
> Fixes: 5e7596ba7cb3 ("vdpa/sfc: introduce Xilinx vDPA driver")
> 
> Signed-off-by: Weiguo Li <liwg06@foxmail.com>
> ---
>   drivers/vdpa/sfc/sfc_vdpa.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
> index fccdd8c687..53f598facc 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa.c
> +++ b/drivers/vdpa/sfc/sfc_vdpa.c
> @@ -328,7 +328,8 @@ sfc_vdpa_pci_remove(struct rte_pci_device *pci_dev)
>   
>   	sva = sfc_vdpa_get_adapter_by_dev(pci_dev);
>   	if (sva == NULL) {
> -		sfc_vdpa_info(sva, "invalid device: %s", pci_dev->name);
> +		SFC_VDPA_GENERIC_LOG(INFO,
> +			"Invalid device: %s.", pci_dev->name);
>   		return -1;
>   	}
>   

Applied to dpdk-next-virtio/main.

Thanks,
Maxime