2018-12-24 18:28:43

by Aditya Pakki

[permalink] [raw]

Subject: [PATCH] infiniband/qedr: Potential null ptr dereference of qp

---

idr_find() may fail and return a NULL pointer. The fix checks the
return value of the function and returns an error in case of NULL.

Signed-off-by: Aditya Pakki <[email protected]>
---
drivers/infiniband/hw/qedr/qedr_iw_cm.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/infiniband/hw/qedr/qedr_iw_cm.c b/drivers/infiniband/hw/qedr/qedr_iw_cm.c
index 505fa3648762..93b16237b767 100644
--- a/drivers/infiniband/hw/qedr/qedr_iw_cm.c
+++ b/drivers/infiniband/hw/qedr/qedr_iw_cm.c
@@ -492,6 +492,8 @@ int qedr_iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
int i;

qp = idr_find(&dev->qpidr.idr, conn_param->qpn);
+ if (unlikely(!qp))
+ return -EINVAL;

laddr = (struct sockaddr_in *)&cm_id->m_local_addr;
raddr = (struct sockaddr_in *)&cm_id->m_remote_addr;
--
2.17.1

2018-12-25 04:27:26

by Leon Romanovsky

[permalink] [raw]

Subject: Re: [PATCH] infiniband/qedr: Potential null ptr dereference of qp

---

On Mon, Dec 24, 2018 at 12:24:45PM -0600, Aditya Pakki wrote:
> idr_find() may fail and return a NULL pointer. The fix checks the
> return value of the function and returns an error in case of NULL.
>
> Signed-off-by: Aditya Pakki <[email protected]>
> ---
> drivers/infiniband/hw/qedr/qedr_iw_cm.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/infiniband/hw/qedr/qedr_iw_cm.c b/drivers/infiniband/hw/qedr/qedr_iw_cm.c
> index 505fa3648762..93b16237b767 100644
> --- a/drivers/infiniband/hw/qedr/qedr_iw_cm.c
> +++ b/drivers/infiniband/hw/qedr/qedr_iw_cm.c
> @@ -492,6 +492,8 @@ int qedr_iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
> int i;
>
> qp = idr_find(&dev->qpidr.idr, conn_param->qpn);
> + if (unlikely(!qp))
> + return -EINVAL;

As was already pointed, qedr is racy in their accesses to idr_find() and
NULL pointer is less worry about their IDR code.

>
> laddr = (struct sockaddr_in *)&cm_id->m_local_addr;
> raddr = (struct sockaddr_in *)&cm_id->m_remote_addr;
> --
> 2.17.1
>

---

Attachments:

(No filename) (1.05 kB)
signature.asc (817.00 B)
Download all attachments

2018-12-25 13:16:18

by Michal Kalderon

[permalink] [raw]

Subject: RE: [EXT] [PATCH] infiniband/qedr: Potential null ptr dereference of qp

---

> From: Aditya Pakki <[email protected]>
> Sent: Monday, December 24, 2018 8:25 PM
>
> External Email
>
> ----------------------------------------------------------------------
> External Email
>
> idr_find() may fail and return a NULL pointer. The fix checks the return value
> of the function and returns an error in case of NULL.
>
> Signed-off-by: Aditya Pakki <[email protected]>
> ---
> drivers/infiniband/hw/qedr/qedr_iw_cm.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/infiniband/hw/qedr/qedr_iw_cm.c
> b/drivers/infiniband/hw/qedr/qedr_iw_cm.c
> index 505fa3648762..93b16237b767 100644
> --- a/drivers/infiniband/hw/qedr/qedr_iw_cm.c
> +++ b/drivers/infiniband/hw/qedr/qedr_iw_cm.c
> @@ -492,6 +492,8 @@ int qedr_iw_connect(struct iw_cm_id *cm_id, struct
> iw_cm_conn_param *conn_param)
> int i;
>
> qp = idr_find(&dev->qpidr.idr, conn_param->qpn);
> + if (unlikely(!qp))
> + return -EINVAL;
>
> laddr = (struct sockaddr_in *)&cm_id->m_local_addr;
> raddr = (struct sockaddr_in *)&cm_id->m_remote_addr;
> --
> 2.17.1

Thanks,

Acked-by: Michal Kalderon <[email protected]>

2019-01-03 03:02:01

by Jason Gunthorpe

[permalink] [raw]

Subject: Re: [PATCH] infiniband/qedr: Potential null ptr dereference of qp

---

On Mon, Dec 24, 2018 at 12:24:45PM -0600, Aditya Pakki wrote:
> idr_find() may fail and return a NULL pointer. The fix checks the
> return value of the function and returns an error in case of NULL.
>
> Signed-off-by: Aditya Pakki <[email protected]>
> Acked-by: Michal Kalderon <[email protected]>
> ---
> drivers/infiniband/hw/qedr/qedr_iw_cm.c | 2 ++
> 1 file changed, 2 insertions(+)

Applied to for-rc thanks

Jason