[PATCH] infiniband: hw: qedr: add null check before pointer dereference

[PATCH] infiniband: hw: qedr: add null check before pointer dereference

[Gustavo A. R. Silva]

Add null check before dereferencing pointer sgid_attr.ndev
inside function rdma_vlan_dev_vlan_id().

Addresses-Coverity-ID: 1373979
Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
---
 drivers/infiniband/hw/qedr/qedr_cm.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/infiniband/hw/qedr/qedr_cm.c b/drivers/infiniband/hw/qedr/qedr_cm.c
index 3d7705c..d86dbe8 100644
--- a/drivers/infiniband/hw/qedr/qedr_cm.c
+++ b/drivers/infiniband/hw/qedr/qedr_cm.c
@@ -270,11 +270,13 @@ static inline int qedr_gsi_build_header(struct qedr_dev *dev,
 		return rc;
 	}
 
-	vlan_id = rdma_vlan_dev_vlan_id(sgid_attr.ndev);
-	if (vlan_id < VLAN_CFI_MASK)
-		has_vlan = true;
-	if (sgid_attr.ndev)
+	if (sgid_attr.ndev) {
+		vlan_id = rdma_vlan_dev_vlan_id(sgid_attr.ndev);
+		if (vlan_id < VLAN_CFI_MASK)
+			has_vlan = true;
+
 		dev_put(sgid_attr.ndev);
+	}
 
 	if (!memcmp(&sgid, &zgid, sizeof(sgid))) {
 		DP_ERR(dev, "gsi post send: GID not found GID index %d\n",
-- 
2.5.0

Re: [PATCH] infiniband: hw: qedr: add null check before pointer dereference

[Leon Romanovsky]

[-- Attachment #1: Type: text/plain, Size: 1402 bytes --]

On Mon, May 22, 2017 at 01:30:15PM -0500, Gustavo A. R. Silva wrote:
> Add null check before dereferencing pointer sgid_attr.ndev
> inside function rdma_vlan_dev_vlan_id().
>
> Addresses-Coverity-ID: 1373979
> Signed-off-by: Gustavo A. R. Silva <garsilva-L1vi/lXTdts+Va1GwOuvDg@public.gmane.org>
> ---
>  drivers/infiniband/hw/qedr/qedr_cm.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)

+ Ram,

Ram, IB part of qedr driver doesn't exist in MAINTAINERS file.

>
> diff --git a/drivers/infiniband/hw/qedr/qedr_cm.c b/drivers/infiniband/hw/qedr/qedr_cm.c
> index 3d7705c..d86dbe8 100644
> --- a/drivers/infiniband/hw/qedr/qedr_cm.c
> +++ b/drivers/infiniband/hw/qedr/qedr_cm.c
> @@ -270,11 +270,13 @@ static inline int qedr_gsi_build_header(struct qedr_dev *dev,
>  		return rc;
>  	}
>
> -	vlan_id = rdma_vlan_dev_vlan_id(sgid_attr.ndev);
> -	if (vlan_id < VLAN_CFI_MASK)
> -		has_vlan = true;
> -	if (sgid_attr.ndev)
> +	if (sgid_attr.ndev) {
> +		vlan_id = rdma_vlan_dev_vlan_id(sgid_attr.ndev);
> +		if (vlan_id < VLAN_CFI_MASK)
> +			has_vlan = true;
> +
>  		dev_put(sgid_attr.ndev);
> +	}

I do agree that it is better than kernel panic trying to access NULL
pointer, but I'm not sure that retaining default vlan_id = 0 is correct
solution here.

>
>  	if (!memcmp(&sgid, &zgid, sizeof(sgid))) {
>  		DP_ERR(dev, "gsi post send: GID not found GID index %d\n",
> --
> 2.5.0
>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

RE: [PATCH] infiniband: hw: qedr: add null check before pointer dereference

[Amrani, Ram]

> + Ram,
> 
> Ram, IB part of qedr driver doesn't exist in MAINTAINERS file.
> 

Weird. I'll fix it.
Thanks,
Ram


--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH] infiniband: hw: qedr: add null check before pointer dereference

[Amrani, Ram]

> Add null check before dereferencing pointer sgid_attr.ndev
> inside function rdma_vlan_dev_vlan_id().
> 
> Addresses-Coverity-ID: 1373979
> Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
> ---
>  drivers/infiniband/hw/qedr/qedr_cm.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/infiniband/hw/qedr/qedr_cm.c b/drivers/infiniband/hw/qedr/qedr_cm.c
> index 3d7705c..d86dbe8 100644
> --- a/drivers/infiniband/hw/qedr/qedr_cm.c
> +++ b/drivers/infiniband/hw/qedr/qedr_cm.c
> @@ -270,11 +270,13 @@ static inline int qedr_gsi_build_header(struct qedr_dev *dev,
>  		return rc;
>  	}
> 
> -	vlan_id = rdma_vlan_dev_vlan_id(sgid_attr.ndev);
> -	if (vlan_id < VLAN_CFI_MASK)
> -		has_vlan = true;
> -	if (sgid_attr.ndev)
> +	if (sgid_attr.ndev) {
> +		vlan_id = rdma_vlan_dev_vlan_id(sgid_attr.ndev);
> +		if (vlan_id < VLAN_CFI_MASK)
> +			has_vlan = true;
> +
>  		dev_put(sgid_attr.ndev);
> +	}
> 
>  	if (!memcmp(&sgid, &zgid, sizeof(sgid))) {
>  		DP_ERR(dev, "gsi post send: GID not found GID index %d\n",
> --
> 2.5.0
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Thanks.

Acked-by: Ram Amrani <Ram.Amrani@cavium.com>

Re: [PATCH] infiniband: hw: qedr: add null check before pointer dereference

[Doug Ledford]

On Mon, 2017-05-22 at 13:30 -0500, Gustavo A. R. Silva wrote:
> Add null check before dereferencing pointer sgid_attr.ndev
> inside function rdma_vlan_dev_vlan_id().
> 
> Addresses-Coverity-ID: 1373979
> Signed-off-by: Gustavo A. R. Silva <garsilva-L1vi/lXTdts+Va1GwOuvDg@public.gmane.org>
> ---

Thanks, applied.

-- 
Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
    GPG KeyID: B826A3330E572FDD
   
Key fingerprint = AE6B 1BDA 122B 23B4 265B  1274 B826 A333 0E57 2FDD

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html