From: Michael Margolin <mrgolin@amazon.com>
To: <jgg@nvidia.com>, <leon@kernel.org>, <linux-rdma@vger.kernel.org>
Cc: <sleybo@amazon.com>, <matua@amazon.com>, <gal.pressman@linux.dev>,
"Yonatan Nachum" <ynachum@amazon.com>,
Firas Jahjah <firasj@amazon.com>
Subject: [PATCH for-next 3/5] RDMA/efa: Validate EQ array out of bounds reach
Date: Mon, 24 Jun 2024 16:09:16 +0000 [thread overview]
Message-ID: <20240624160918.27060-4-mrgolin@amazon.com> (raw)
In-Reply-To: <20240624160918.27060-1-mrgolin@amazon.com>
From: Yonatan Nachum <ynachum@amazon.com>
When creating a new CQ with interrupts enabled, the caller needs to
specify an EQ index to which the interrupts will be sent on, we don't
validate the requested index in the EQ array.
Validate out of bound reach of the EQ array and return an error.
This is not a bug because IB core validates the requested EQ number when
creating a CQ.
Reviewed-by: Firas Jahjah <firasj@amazon.com>
Signed-off-by: Yonatan Nachum <ynachum@amazon.com>
Signed-off-by: Michael Margolin <mrgolin@amazon.com>
---
drivers/infiniband/hw/efa/efa_verbs.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/infiniband/hw/efa/efa_verbs.c b/drivers/infiniband/hw/efa/efa_verbs.c
index cd1f735d08a7..9c3e476e3f9c 100644
--- a/drivers/infiniband/hw/efa/efa_verbs.c
+++ b/drivers/infiniband/hw/efa/efa_verbs.c
@@ -1046,7 +1046,7 @@ int efa_destroy_cq(struct ib_cq *ibcq, struct ib_udata *udata)
static struct efa_eq *efa_vec2eq(struct efa_dev *dev, int vec)
{
- return &dev->eqs[vec];
+ return vec < dev->neqs ? &dev->eqs[vec] : NULL;
}
static int cq_mmap_entries_setup(struct efa_dev *dev, struct efa_cq *cq,
@@ -1173,6 +1173,11 @@ int efa_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
params.set_src_addr = set_src_addr;
if (cmd.flags & EFA_CREATE_CQ_WITH_COMPLETION_CHANNEL) {
cq->eq = efa_vec2eq(dev, attr->comp_vector);
+ if (!cq->eq) {
+ ibdev_dbg(ibdev, "Invalid EQ requested[%u]\n", attr->comp_vector);
+ err = -EINVAL;
+ goto err_free_mapped;
+ }
params.eqn = cq->eq->eeq.eqn;
params.interrupt_mode_enabled = true;
}
--
2.40.1
next prev parent reply other threads:[~2024-06-24 16:10 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-24 16:09 [PATCH for-next 0/5] RDMA/efa: Cleanups and minor improvements Michael Margolin
2024-06-24 16:09 ` [PATCH for-next 1/5] RDMA/efa: Use offset_in_page() function Michael Margolin
2024-06-25 6:32 ` Gal Pressman
2024-06-24 16:09 ` [PATCH for-next 2/5] RDMA/efa: Remove duplicate aenq enable macro Michael Margolin
2024-06-25 6:32 ` Gal Pressman
2024-06-24 16:09 ` Michael Margolin [this message]
2024-06-25 6:33 ` [PATCH for-next 3/5] RDMA/efa: Validate EQ array out of bounds reach Gal Pressman
2024-06-25 11:28 ` Margolin, Michael
2024-06-25 14:16 ` Leon Romanovsky
2024-06-24 16:09 ` [PATCH for-next 4/5] RDMA/efa: Move type conversion helpers to efa.h Michael Margolin
2024-06-25 6:33 ` Gal Pressman
2024-06-25 11:21 ` Margolin, Michael
2024-06-25 14:19 ` Leon Romanovsky
2024-06-24 16:09 ` [PATCH for-next 5/5] RDMA/efa: Align private func names to a single convention Michael Margolin
2024-06-26 15:38 ` Jason Gunthorpe
2024-06-27 16:57 ` Margolin, Michael
2024-06-27 18:43 ` Leon Romanovsky
2024-06-28 14:27 ` Jason Gunthorpe
2024-06-26 17:55 ` [PATCH for-next 0/5] RDMA/efa: Cleanups and minor improvements Jason Gunthorpe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240624160918.27060-4-mrgolin@amazon.com \
--to=mrgolin@amazon.com \
--cc=firasj@amazon.com \
--cc=gal.pressman@linux.dev \
--cc=jgg@nvidia.com \
--cc=leon@kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=matua@amazon.com \
--cc=sleybo@amazon.com \
--cc=ynachum@amazon.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).