[v2] vdpa/sfc: fix null dereference

Message ID tencent_C4CD294184ACCEE037C708ABC84E8C39CF06@qq.com (mailing list archive)
State Accepted, archived
Delegated to: Maxime Coquelin
Headers
Series [v2] vdpa/sfc: fix null dereference |

Checks

Context Check Description
ci/checkpatch warning coding style issues
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/github-robot: build success github build: passed
ci/iol-aarch64-unit-testing success Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-abi-testing success Testing PASS
ci/iol-intel-Functional success Functional Testing PASS

Commit Message

Weiguo Li Jan. 29, 2022, 6:07 p.m. UTC
  Fixes: b11961363b4a ("vdpa/sfc: support device configure and close")

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

Comments

Maxime Coquelin Feb. 3, 2022, 1:49 p.m. UTC | #1
On 1/29/22 19:07, Weiguo Li wrote:
> Fixes: b11961363b4a ("vdpa/sfc: support device configure and close")
> 
> Signed-off-by: Weiguo Li <liwg06@foxmail.com>
> ---
>   drivers/vdpa/sfc/sfc_vdpa_ops.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
> index c4ce4474ef..b3d9b6cd56 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
> +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
> @@ -611,7 +611,7 @@ sfc_vdpa_dev_config(int vid)
>   
>   	ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
>   	if (ops_data == NULL) {
> -		sfc_vdpa_err(ops_data->dev_handle,
> +		SFC_VDPA_GENERIC_LOG(ERR,
>   			     "invalid vDPA device : %p, vid : %d",
>   			     vdpa_dev, vid);
>   		return -1;
> @@ -666,7 +666,7 @@ sfc_vdpa_dev_close(int vid)
>   
>   	ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
>   	if (ops_data == NULL) {
> -		sfc_vdpa_err(ops_data->dev_handle,
> +		SFC_VDPA_GENERIC_LOG(ERR,
>   			     "invalid vDPA device : %p, vid : %d",
>   			     vdpa_dev, vid);
>   		return -1;

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

Thanks,
Maxime
  
Maxime Coquelin Feb. 10, 2022, 3:12 p.m. UTC | #2
On 1/29/22 19:07, Weiguo Li wrote:
> Fixes: b11961363b4a ("vdpa/sfc: support device configure and close")
> 
> Signed-off-by: Weiguo Li <liwg06@foxmail.com>
> ---
>   drivers/vdpa/sfc/sfc_vdpa_ops.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
> index c4ce4474ef..b3d9b6cd56 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
> +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
> @@ -611,7 +611,7 @@ sfc_vdpa_dev_config(int vid)
>   
>   	ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
>   	if (ops_data == NULL) {
> -		sfc_vdpa_err(ops_data->dev_handle,
> +		SFC_VDPA_GENERIC_LOG(ERR,
>   			     "invalid vDPA device : %p, vid : %d",
>   			     vdpa_dev, vid);
>   		return -1;
> @@ -666,7 +666,7 @@ sfc_vdpa_dev_close(int vid)
>   
>   	ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
>   	if (ops_data == NULL) {
> -		sfc_vdpa_err(ops_data->dev_handle,
> +		SFC_VDPA_GENERIC_LOG(ERR,
>   			     "invalid vDPA device : %p, vid : %d",
>   			     vdpa_dev, vid);
>   		return -1;


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

Thanks,
Maxime
  

Patch

diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index c4ce4474ef..b3d9b6cd56 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -611,7 +611,7 @@  sfc_vdpa_dev_config(int vid)
 
 	ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
 	if (ops_data == NULL) {
-		sfc_vdpa_err(ops_data->dev_handle,
+		SFC_VDPA_GENERIC_LOG(ERR,
 			     "invalid vDPA device : %p, vid : %d",
 			     vdpa_dev, vid);
 		return -1;
@@ -666,7 +666,7 @@  sfc_vdpa_dev_close(int vid)
 
 	ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
 	if (ops_data == NULL) {
-		sfc_vdpa_err(ops_data->dev_handle,
+		SFC_VDPA_GENERIC_LOG(ERR,
 			     "invalid vDPA device : %p, vid : %d",
 			     vdpa_dev, vid);
 		return -1;