Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1647254 > unrolled thread

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

Started by"Gustavo A. R. Silva" <garsilva@embeddedor.com>
First post2017-05-22 20:40 +0200
Last post2017-05-23 17:10 +0200
Articles 4 — 3 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] infiniband: hw: qedr: add null check before pointer  dereference "Gustavo A. R. Silva" <garsilva@embeddedor.com> - 2017-05-22 20:40 +0200
    Re: [PATCH] infiniband: hw: qedr: add null check before pointer  dereference Leon Romanovsky <leon@kernel.org> - 2017-05-23 09:20 +0200
      RE: [PATCH] infiniband: hw: qedr: add null check before pointer  dereference "Amrani, Ram" <Ram.Amrani@cavium.com> - 2017-05-23 17:10 +0200
    RE: [PATCH] infiniband: hw: qedr: add null check before pointer  dereference "Amrani, Ram" <Ram.Amrani@cavium.com> - 2017-05-23 17:10 +0200

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

From"Gustavo A. R. Silva" <garsilva@embeddedor.com>
Date2017-05-22 20:40 +0200
Subject[PATCH] infiniband: hw: qedr: add null check before pointer dereference
Message-ID<tK0pj-KA-3@gated-at.bofh.it>
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

[toc] | [next] | [standalone]


#1647709

FromLeon Romanovsky <leon@kernel.org>
Date2017-05-23 09:20 +0200
Message-ID<tKcgN-8mw-9@gated-at.bofh.it>
In reply to#1647254

[Multipart message — attachments visible in raw view] — view raw

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@embeddedor.com>
> ---
>  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
>

[toc] | [prev] | [next] | [standalone]


#1648168

From"Amrani, Ram" <Ram.Amrani@cavium.com>
Date2017-05-23 17:10 +0200
Message-ID<tKjBD-4S4-11@gated-at.bofh.it>
In reply to#1647709
> + Ram,
> 
> Ram, IB part of qedr driver doesn't exist in MAINTAINERS file.
> 

Weird. I'll fix it.
Thanks,
Ram

[toc] | [prev] | [next] | [standalone]


#1648166

From"Amrani, Ram" <Ram.Amrani@cavium.com>
Date2017-05-23 17:10 +0200
Message-ID<tKjBD-4S4-9@gated-at.bofh.it>
In reply to#1647254
> 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>

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web