* [PATCH rdma-rc] RDMA/siw: Properly check send and receive CQ pointers
@ 2021-05-09 11:39 Leon Romanovsky
2021-05-10 9:33 ` Bernard Metzler
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Leon Romanovsky @ 2021-05-09 11:39 UTC (permalink / raw)
To: Doug Ledford, Jason Gunthorpe
Cc: Leon Romanovsky, Bernard Metzler, linux-kernel, linux-rdma
From: Leon Romanovsky <leonro@nvidia.com>
The check for the NULL of pointer received from container_of is
incorrect by definition as it points to some random memory.
Change such check with proper NULL check of SIW QP attributes.
Fixes: 303ae1cdfdf7 ("rdma/siw: application interface")
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
---
drivers/infiniband/sw/siw/siw_verbs.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/infiniband/sw/siw/siw_verbs.c b/drivers/infiniband/sw/siw/siw_verbs.c
index d2313efb26db..917c8a919f38 100644
--- a/drivers/infiniband/sw/siw/siw_verbs.c
+++ b/drivers/infiniband/sw/siw/siw_verbs.c
@@ -300,7 +300,6 @@ struct ib_qp *siw_create_qp(struct ib_pd *pd,
struct siw_ucontext *uctx =
rdma_udata_to_drv_context(udata, struct siw_ucontext,
base_ucontext);
- struct siw_cq *scq = NULL, *rcq = NULL;
unsigned long flags;
int num_sqe, num_rqe, rv = 0;
size_t length;
@@ -343,10 +342,8 @@ struct ib_qp *siw_create_qp(struct ib_pd *pd,
rv = -EINVAL;
goto err_out;
}
- scq = to_siw_cq(attrs->send_cq);
- rcq = to_siw_cq(attrs->recv_cq);
- if (!scq || (!rcq && !attrs->srq)) {
+ if (!attrs->send_cq || (!attrs->recv_cq && !attrs->srq)) {
siw_dbg(base_dev, "send CQ or receive CQ invalid\n");
rv = -EINVAL;
goto err_out;
@@ -401,8 +398,8 @@ struct ib_qp *siw_create_qp(struct ib_pd *pd,
}
}
qp->pd = pd;
- qp->scq = scq;
- qp->rcq = rcq;
+ qp->scq = to_siw_cq(attrs->send_cq);
+ qp->rcq = to_siw_cq(attrs->recv_cq);
if (attrs->srq) {
/*
--
2.31.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH rdma-rc] RDMA/siw: Properly check send and receive CQ pointers
2021-05-09 11:39 [PATCH rdma-rc] RDMA/siw: Properly check send and receive CQ pointers Leon Romanovsky
@ 2021-05-10 9:33 ` Bernard Metzler
2021-05-10 17:30 ` Bernard Metzler
2021-05-10 19:22 ` Jason Gunthorpe
2 siblings, 0 replies; 4+ messages in thread
From: Bernard Metzler @ 2021-05-10 9:33 UTC (permalink / raw)
To: Leon Romanovsky
Cc: Doug Ledford, Jason Gunthorpe, Leon Romanovsky, linux-kernel, linux-rdma
-----"Leon Romanovsky" <leon@kernel.org> wrote: -----
>To: "Doug Ledford" <dledford@redhat.com>, "Jason Gunthorpe"
><jgg@nvidia.com>
>From: "Leon Romanovsky" <leon@kernel.org>
>Date: 05/09/2021 01:39PM
>Cc: "Leon Romanovsky" <leonro@nvidia.com>, "Bernard Metzler"
><bmt@zurich.ibm.com>, linux-kernel@vger.kernel.org,
>linux-rdma@vger.kernel.org
>Subject: [EXTERNAL] [PATCH rdma-rc] RDMA/siw: Properly check send and
>receive CQ pointers
>
>From: Leon Romanovsky <leonro@nvidia.com>
>
>The check for the NULL of pointer received from container_of is
>incorrect by definition as it points to some random memory.
>
>Change such check with proper NULL check of SIW QP attributes.
>
>Fixes: 303ae1cdfdf7 ("rdma/siw: application interface")
>Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
>---
> drivers/infiniband/sw/siw/siw_verbs.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/infiniband/sw/siw/siw_verbs.c
>b/drivers/infiniband/sw/siw/siw_verbs.c
>index d2313efb26db..917c8a919f38 100644
>--- a/drivers/infiniband/sw/siw/siw_verbs.c
>+++ b/drivers/infiniband/sw/siw/siw_verbs.c
>@@ -300,7 +300,6 @@ struct ib_qp *siw_create_qp(struct ib_pd *pd,
> struct siw_ucontext *uctx =
> rdma_udata_to_drv_context(udata, struct siw_ucontext,
> base_ucontext);
>- struct siw_cq *scq = NULL, *rcq = NULL;
> unsigned long flags;
> int num_sqe, num_rqe, rv = 0;
> size_t length;
>@@ -343,10 +342,8 @@ struct ib_qp *siw_create_qp(struct ib_pd *pd,
> rv = -EINVAL;
> goto err_out;
> }
>- scq = to_siw_cq(attrs->send_cq);
>- rcq = to_siw_cq(attrs->recv_cq);
>
>- if (!scq || (!rcq && !attrs->srq)) {
>+ if (!attrs->send_cq || (!attrs->recv_cq && !attrs->srq)) {
> siw_dbg(base_dev, "send CQ or receive CQ invalid\n");
> rv = -EINVAL;
> goto err_out;
>@@ -401,8 +398,8 @@ struct ib_qp *siw_create_qp(struct ib_pd *pd,
> }
> }
> qp->pd = pd;
>- qp->scq = scq;
>- qp->rcq = rcq;
>+ qp->scq = to_siw_cq(attrs->send_cq);
>+ qp->rcq = to_siw_cq(attrs->recv_cq);
>
> if (attrs->srq) {
> /*
>--
>2.31.1
>
>
Thanks Leon!
Reviewed-by: Bernard Metzler <bmt@zurich.ibm.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH rdma-rc] RDMA/siw: Properly check send and receive CQ pointers
2021-05-09 11:39 [PATCH rdma-rc] RDMA/siw: Properly check send and receive CQ pointers Leon Romanovsky
2021-05-10 9:33 ` Bernard Metzler
@ 2021-05-10 17:30 ` Bernard Metzler
2021-05-10 19:22 ` Jason Gunthorpe
2 siblings, 0 replies; 4+ messages in thread
From: Bernard Metzler @ 2021-05-10 17:30 UTC (permalink / raw)
To: Leon Romanovsky
Cc: Doug Ledford, Jason Gunthorpe, Leon Romanovsky, linux-kernel, linux-rdma
-----"Leon Romanovsky" <leon@kernel.org> wrote: -----
>To: "Doug Ledford" <dledford@redhat.com>, "Jason Gunthorpe"
><jgg@nvidia.com>
>From: "Leon Romanovsky" <leon@kernel.org>
>Date: 05/09/2021 01:39PM
>Cc: "Leon Romanovsky" <leonro@nvidia.com>, "Bernard Metzler"
><bmt@zurich.ibm.com>, linux-kernel@vger.kernel.org,
>linux-rdma@vger.kernel.org
>Subject: [EXTERNAL] [PATCH rdma-rc] RDMA/siw: Properly check send and
>receive CQ pointers
>
>From: Leon Romanovsky <leonro@nvidia.com>
>
>The check for the NULL of pointer received from container_of is
>incorrect by definition as it points to some random memory.
>
>Change such check with proper NULL check of SIW QP attributes.
>
>Fixes: 303ae1cdfdf7 ("rdma/siw: application interface")
>Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
>---
> drivers/infiniband/sw/siw/siw_verbs.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/infiniband/sw/siw/siw_verbs.c
>b/drivers/infiniband/sw/siw/siw_verbs.c
>index d2313efb26db..917c8a919f38 100644
>--- a/drivers/infiniband/sw/siw/siw_verbs.c
>+++ b/drivers/infiniband/sw/siw/siw_verbs.c
>@@ -300,7 +300,6 @@ struct ib_qp *siw_create_qp(struct ib_pd *pd,
> struct siw_ucontext *uctx =
> rdma_udata_to_drv_context(udata, struct siw_ucontext,
> base_ucontext);
>- struct siw_cq *scq = NULL, *rcq = NULL;
> unsigned long flags;
> int num_sqe, num_rqe, rv = 0;
> size_t length;
>@@ -343,10 +342,8 @@ struct ib_qp *siw_create_qp(struct ib_pd *pd,
> rv = -EINVAL;
> goto err_out;
> }
>- scq = to_siw_cq(attrs->send_cq);
>- rcq = to_siw_cq(attrs->recv_cq);
>
>- if (!scq || (!rcq && !attrs->srq)) {
>+ if (!attrs->send_cq || (!attrs->recv_cq && !attrs->srq)) {
> siw_dbg(base_dev, "send CQ or receive CQ invalid\n");
> rv = -EINVAL;
> goto err_out;
>@@ -401,8 +398,8 @@ struct ib_qp *siw_create_qp(struct ib_pd *pd,
> }
> }
> qp->pd = pd;
>- qp->scq = scq;
>- qp->rcq = rcq;
>+ qp->scq = to_siw_cq(attrs->send_cq);
>+ qp->rcq = to_siw_cq(attrs->recv_cq);
>
> if (attrs->srq) {
> /*
>--
>2.31.1
>
>
Many thanks Leon!
Reviewed-by: Bernard Metzler <bmt@zurich.ibm.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH rdma-rc] RDMA/siw: Properly check send and receive CQ pointers
2021-05-09 11:39 [PATCH rdma-rc] RDMA/siw: Properly check send and receive CQ pointers Leon Romanovsky
2021-05-10 9:33 ` Bernard Metzler
2021-05-10 17:30 ` Bernard Metzler
@ 2021-05-10 19:22 ` Jason Gunthorpe
2 siblings, 0 replies; 4+ messages in thread
From: Jason Gunthorpe @ 2021-05-10 19:22 UTC (permalink / raw)
To: Leon Romanovsky
Cc: Doug Ledford, Leon Romanovsky, Bernard Metzler, linux-kernel, linux-rdma
On Sun, May 09, 2021 at 02:39:21PM +0300, Leon Romanovsky wrote:
> From: Leon Romanovsky <leonro@nvidia.com>
>
> The check for the NULL of pointer received from container_of is
> incorrect by definition as it points to some random memory.
>
> Change such check with proper NULL check of SIW QP attributes.
>
> Fixes: 303ae1cdfdf7 ("rdma/siw: application interface")
> Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
> Reviewed-by: Bernard Metzler <bmt@zurich.ibm.com>
> ---
> drivers/infiniband/sw/siw/siw_verbs.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
Applied to for-rc, thanks
Jason
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-05-10 19:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-09 11:39 [PATCH rdma-rc] RDMA/siw: Properly check send and receive CQ pointers Leon Romanovsky
2021-05-10 9:33 ` Bernard Metzler
2021-05-10 17:30 ` Bernard Metzler
2021-05-10 19:22 ` Jason Gunthorpe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).