vdpa/ifc: fix null pointer dereference

Message ID 1654673642-151882-1-git-send-email-andy.pei@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Maxime Coquelin
Headers
Series vdpa/ifc: fix null pointer dereference |

Checks

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

Commit Message

Pei, Andy June 8, 2022, 7:34 a.m. UTC
  Fix null pointer dereference reported in coverity scan.

Coverity issue: 378882
Fixes: 8162a4a9 ("vdpa/ifc/base: access correct register for blk device")
Signed-off-by: Andy Pei <andy.pei@intel.com>
---
 drivers/vdpa/ifc/base/ifcvf.c | 9 +++++++++
 1 file changed, 9 insertions(+)
  

Comments

Xiao Wang June 8, 2022, 8:25 a.m. UTC | #1
Hi

> -----Original Message-----
> From: Pei, Andy <andy.pei@intel.com>
> Sent: Wednesday, June 8, 2022 3:34 PM
> To: dev@dpdk.org
> Cc: Xia, Chenbo <chenbo.xia@intel.com>; maxime.coquelin@redhat.com;
> Wang, Xiao W <xiao.w.wang@intel.com>; Xu, Rosen <rosen.xu@intel.com>;
> Xiao, QimaiX <qimaix.xiao@intel.com>
> Subject: [PATCH] vdpa/ifc: fix null pointer dereference
> 
> Fix null pointer dereference reported in coverity scan.
> 
> Coverity issue: 378882
> Fixes: 8162a4a9 ("vdpa/ifc/base: access correct register for blk device")
> Signed-off-by: Andy Pei <andy.pei@intel.com>
> ---
>  drivers/vdpa/ifc/base/ifcvf.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/drivers/vdpa/ifc/base/ifcvf.c b/drivers/vdpa/ifc/base/ifcvf.c
> index dd475a7..0a9f71a 100644
> --- a/drivers/vdpa/ifc/base/ifcvf.c
> +++ b/drivers/vdpa/ifc/base/ifcvf.c
> @@ -255,6 +255,10 @@
>  	u32 ring_state;
> 
>  	cfg = hw->common_cfg;
> +	if (!cfg) {
> +		DEBUGOUT("common_cfg in HW is NULL.\n");
> +		return;
> +	}
> 
>  	IFCVF_WRITE_REG16(IFCVF_MSI_NO_VECTOR, &cfg->msix_config);
>  	for (i = 0; i < hw->nr_vring; i++) {
> @@ -262,6 +266,11 @@
>  		IFCVF_WRITE_REG16(0, &cfg->queue_enable);
>  		IFCVF_WRITE_REG16(IFCVF_MSI_NO_VECTOR, &cfg-
> >queue_msix_vector);
> 
> +		if (!hw->lm_cfg) {
> +			DEBUGOUT("live migration cfg in HW is NULL.\n");
> +			continue;
> +		}
> +
>  		if (hw->device_type == IFCVF_BLK)
>  			ring_state = *(u32 *)(hw->lm_cfg +
>  					IFCVF_LM_RING_STATE_OFFSET +
> --
> 1.8.3.1

Acked-by: Xiao Wang <xiao.w.wang@intel.com>

BRs,
Xiao
  
Chenbo Xia June 15, 2022, 2:04 a.m. UTC | #2
Hi Andy,

> -----Original Message-----
> From: Pei, Andy <andy.pei@intel.com>
> Sent: Wednesday, June 8, 2022 3:34 PM
> To: dev@dpdk.org
> Cc: Xia, Chenbo <chenbo.xia@intel.com>; maxime.coquelin@redhat.com; Wang,
> Xiao W <xiao.w.wang@intel.com>; Xu, Rosen <rosen.xu@intel.com>; Xiao,
> QimaiX <qimaix.xiao@intel.com>
> Subject: [PATCH] vdpa/ifc: fix null pointer dereference
> 
> Fix null pointer dereference reported in coverity scan.
> 
> Coverity issue: 378882
> Fixes: 8162a4a9 ("vdpa/ifc/base: access correct register for blk device")

Commit id need to be 12 digits. Also pls leave a blank line between Fixes tag and signed-off

Thanks,
Chenbo

> Signed-off-by: Andy Pei <andy.pei@intel.com>
> ---
>  drivers/vdpa/ifc/base/ifcvf.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/drivers/vdpa/ifc/base/ifcvf.c b/drivers/vdpa/ifc/base/ifcvf.c
> index dd475a7..0a9f71a 100644
> --- a/drivers/vdpa/ifc/base/ifcvf.c
> +++ b/drivers/vdpa/ifc/base/ifcvf.c
> @@ -255,6 +255,10 @@
>  	u32 ring_state;
> 
>  	cfg = hw->common_cfg;
> +	if (!cfg) {
> +		DEBUGOUT("common_cfg in HW is NULL.\n");
> +		return;
> +	}
> 
>  	IFCVF_WRITE_REG16(IFCVF_MSI_NO_VECTOR, &cfg->msix_config);
>  	for (i = 0; i < hw->nr_vring; i++) {
> @@ -262,6 +266,11 @@
>  		IFCVF_WRITE_REG16(0, &cfg->queue_enable);
>  		IFCVF_WRITE_REG16(IFCVF_MSI_NO_VECTOR, &cfg-
> >queue_msix_vector);
> 
> +		if (!hw->lm_cfg) {
> +			DEBUGOUT("live migration cfg in HW is NULL.\n");
> +			continue;
> +		}
> +
>  		if (hw->device_type == IFCVF_BLK)
>  			ring_state = *(u32 *)(hw->lm_cfg +
>  					IFCVF_LM_RING_STATE_OFFSET +
> --
> 1.8.3.1
  
Pei, Andy June 15, 2022, 7:08 a.m. UTC | #3
Hi Chenbo,

Thanks for your reply.
I will fix this in next version.

> -----Original Message-----
> From: Xia, Chenbo <chenbo.xia@intel.com>
> Sent: Wednesday, June 15, 2022 10:04 AM
> To: Pei, Andy <andy.pei@intel.com>; dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; Wang, Xiao W <xiao.w.wang@intel.com>;
> Xu, Rosen <rosen.xu@intel.com>; Xiao, QimaiX <qimaix.xiao@intel.com>
> Subject: RE: [PATCH] vdpa/ifc: fix null pointer dereference
> 
> Hi Andy,
> 
> > -----Original Message-----
> > From: Pei, Andy <andy.pei@intel.com>
> > Sent: Wednesday, June 8, 2022 3:34 PM
> > To: dev@dpdk.org
> > Cc: Xia, Chenbo <chenbo.xia@intel.com>; maxime.coquelin@redhat.com;
> > Wang, Xiao W <xiao.w.wang@intel.com>; Xu, Rosen <rosen.xu@intel.com>;
> > Xiao, QimaiX <qimaix.xiao@intel.com>
> > Subject: [PATCH] vdpa/ifc: fix null pointer dereference
> >
> > Fix null pointer dereference reported in coverity scan.
> >
> > Coverity issue: 378882
> > Fixes: 8162a4a9 ("vdpa/ifc/base: access correct register for blk
> > device")
> 
> Commit id need to be 12 digits. Also pls leave a blank line between Fixes tag
> and signed-off
> 
> Thanks,
> Chenbo
> 
> > Signed-off-by: Andy Pei <andy.pei@intel.com>
> > ---
> >  drivers/vdpa/ifc/base/ifcvf.c | 9 +++++++++
> >  1 file changed, 9 insertions(+)
> >
> > diff --git a/drivers/vdpa/ifc/base/ifcvf.c
> > b/drivers/vdpa/ifc/base/ifcvf.c index dd475a7..0a9f71a 100644
> > --- a/drivers/vdpa/ifc/base/ifcvf.c
> > +++ b/drivers/vdpa/ifc/base/ifcvf.c
> > @@ -255,6 +255,10 @@
> >  	u32 ring_state;
> >
> >  	cfg = hw->common_cfg;
> > +	if (!cfg) {
> > +		DEBUGOUT("common_cfg in HW is NULL.\n");
> > +		return;
> > +	}
> >
> >  	IFCVF_WRITE_REG16(IFCVF_MSI_NO_VECTOR, &cfg->msix_config);
> >  	for (i = 0; i < hw->nr_vring; i++) { @@ -262,6 +266,11 @@
> >  		IFCVF_WRITE_REG16(0, &cfg->queue_enable);
> >  		IFCVF_WRITE_REG16(IFCVF_MSI_NO_VECTOR, &cfg-
> > >queue_msix_vector);
> >
> > +		if (!hw->lm_cfg) {
> > +			DEBUGOUT("live migration cfg in HW is NULL.\n");
> > +			continue;
> > +		}
> > +
> >  		if (hw->device_type == IFCVF_BLK)
> >  			ring_state = *(u32 *)(hw->lm_cfg +
> >  					IFCVF_LM_RING_STATE_OFFSET +
> > --
> > 1.8.3.1
  

Patch

diff --git a/drivers/vdpa/ifc/base/ifcvf.c b/drivers/vdpa/ifc/base/ifcvf.c
index dd475a7..0a9f71a 100644
--- a/drivers/vdpa/ifc/base/ifcvf.c
+++ b/drivers/vdpa/ifc/base/ifcvf.c
@@ -255,6 +255,10 @@ 
 	u32 ring_state;
 
 	cfg = hw->common_cfg;
+	if (!cfg) {
+		DEBUGOUT("common_cfg in HW is NULL.\n");
+		return;
+	}
 
 	IFCVF_WRITE_REG16(IFCVF_MSI_NO_VECTOR, &cfg->msix_config);
 	for (i = 0; i < hw->nr_vring; i++) {
@@ -262,6 +266,11 @@ 
 		IFCVF_WRITE_REG16(0, &cfg->queue_enable);
 		IFCVF_WRITE_REG16(IFCVF_MSI_NO_VECTOR, &cfg->queue_msix_vector);
 
+		if (!hw->lm_cfg) {
+			DEBUGOUT("live migration cfg in HW is NULL.\n");
+			continue;
+		}
+
 		if (hw->device_type == IFCVF_BLK)
 			ring_state = *(u32 *)(hw->lm_cfg +
 					IFCVF_LM_RING_STATE_OFFSET +