* [PATCH] RDMA/mlx5: Fix query_srq_cmd() function
@ 2020-05-13 9:37 ` Dan Carpenter
0 siblings, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2020-05-13 9:37 UTC (permalink / raw)
To: Leon Romanovsky
Cc: Doug Ledford, Jason Gunthorpe, linux-rdma, kernel-janitors
The "srq_out" pointer is never freed so that causes a memory leak. It's
never used and can be deleted. Freeing "out" will lead to a double in
mlx5_ib_query_srq().
Fixes: 31578defe4eb ("RDMA/mlx5: Update mlx5_ib to use new cmd interface")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/infiniband/hw/mlx5/srq_cmd.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/drivers/infiniband/hw/mlx5/srq_cmd.c b/drivers/infiniband/hw/mlx5/srq_cmd.c
index bc50a712bf2ed..ee85b8087a718 100644
--- a/drivers/infiniband/hw/mlx5/srq_cmd.c
+++ b/drivers/infiniband/hw/mlx5/srq_cmd.c
@@ -159,27 +159,20 @@ static int query_srq_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
struct mlx5_srq_attr *out)
{
u32 in[MLX5_ST_SZ_DW(query_srq_in)] = {};
- u32 *srq_out;
void *srqc;
int err;
- srq_out = kvzalloc(MLX5_ST_SZ_BYTES(query_srq_out), GFP_KERNEL);
- if (!srq_out)
- return -ENOMEM;
-
MLX5_SET(query_srq_in, in, opcode, MLX5_CMD_OP_QUERY_SRQ);
MLX5_SET(query_srq_in, in, srqn, srq->srqn);
err = mlx5_cmd_exec_inout(dev->mdev, query_srq, in, out);
if (err)
- goto out;
+ return err;
srqc = MLX5_ADDR_OF(query_srq_out, out, srq_context_entry);
get_srqc(srqc, out);
if (MLX5_GET(srqc, srqc, state) != MLX5_SRQC_STATE_GOOD)
out->flags |= MLX5_SRQ_FLAG_ERR;
-out:
- kvfree(out);
- return err;
+ return 0;
}
static int create_xrc_srq_cmd(struct mlx5_ib_dev *dev,
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] RDMA/mlx5: Fix query_srq_cmd() function
@ 2020-05-13 9:37 ` Dan Carpenter
0 siblings, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2020-05-13 9:37 UTC (permalink / raw)
To: Leon Romanovsky
Cc: Doug Ledford, Jason Gunthorpe, linux-rdma, kernel-janitors
The "srq_out" pointer is never freed so that causes a memory leak. It's
never used and can be deleted. Freeing "out" will lead to a double in
mlx5_ib_query_srq().
Fixes: 31578defe4eb ("RDMA/mlx5: Update mlx5_ib to use new cmd interface")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/infiniband/hw/mlx5/srq_cmd.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/drivers/infiniband/hw/mlx5/srq_cmd.c b/drivers/infiniband/hw/mlx5/srq_cmd.c
index bc50a712bf2ed..ee85b8087a718 100644
--- a/drivers/infiniband/hw/mlx5/srq_cmd.c
+++ b/drivers/infiniband/hw/mlx5/srq_cmd.c
@@ -159,27 +159,20 @@ static int query_srq_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
struct mlx5_srq_attr *out)
{
u32 in[MLX5_ST_SZ_DW(query_srq_in)] = {};
- u32 *srq_out;
void *srqc;
int err;
- srq_out = kvzalloc(MLX5_ST_SZ_BYTES(query_srq_out), GFP_KERNEL);
- if (!srq_out)
- return -ENOMEM;
-
MLX5_SET(query_srq_in, in, opcode, MLX5_CMD_OP_QUERY_SRQ);
MLX5_SET(query_srq_in, in, srqn, srq->srqn);
err = mlx5_cmd_exec_inout(dev->mdev, query_srq, in, out);
if (err)
- goto out;
+ return err;
srqc = MLX5_ADDR_OF(query_srq_out, out, srq_context_entry);
get_srqc(srqc, out);
if (MLX5_GET(srqc, srqc, state) != MLX5_SRQC_STATE_GOOD)
out->flags |= MLX5_SRQ_FLAG_ERR;
-out:
- kvfree(out);
- return err;
+ return 0;
}
static int create_xrc_srq_cmd(struct mlx5_ib_dev *dev,
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] RDMA/mlx5: Fix query_srq_cmd() function
2020-05-13 9:37 ` Dan Carpenter
@ 2020-05-13 10:00 ` Leon Romanovsky
-1 siblings, 0 replies; 6+ messages in thread
From: Leon Romanovsky @ 2020-05-13 10:00 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Doug Ledford, Jason Gunthorpe, linux-rdma, kernel-janitors
On Wed, May 13, 2020 at 12:37:41PM +0300, Dan Carpenter wrote:
> The "srq_out" pointer is never freed so that causes a memory leak. It's
> never used and can be deleted. Freeing "out" will lead to a double in
> mlx5_ib_query_srq().
>
> Fixes: 31578defe4eb ("RDMA/mlx5: Update mlx5_ib to use new cmd interface")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> drivers/infiniband/hw/mlx5/srq_cmd.c | 11 ++---------
> 1 file changed, 2 insertions(+), 9 deletions(-)
>
Thanks for the report, the change should be slightly different.
I'm sending fix right now.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] RDMA/mlx5: Fix query_srq_cmd() function
@ 2020-05-13 10:00 ` Leon Romanovsky
0 siblings, 0 replies; 6+ messages in thread
From: Leon Romanovsky @ 2020-05-13 10:00 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Doug Ledford, Jason Gunthorpe, linux-rdma, kernel-janitors
On Wed, May 13, 2020 at 12:37:41PM +0300, Dan Carpenter wrote:
> The "srq_out" pointer is never freed so that causes a memory leak. It's
> never used and can be deleted. Freeing "out" will lead to a double in
> mlx5_ib_query_srq().
>
> Fixes: 31578defe4eb ("RDMA/mlx5: Update mlx5_ib to use new cmd interface")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> drivers/infiniband/hw/mlx5/srq_cmd.c | 11 ++---------
> 1 file changed, 2 insertions(+), 9 deletions(-)
>
Thanks for the report, the change should be slightly different.
I'm sending fix right now.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] RDMA/mlx5: Fix query_srq_cmd() function
2020-05-13 10:00 ` Leon Romanovsky
@ 2020-05-13 10:14 ` Leon Romanovsky
-1 siblings, 0 replies; 6+ messages in thread
From: Leon Romanovsky @ 2020-05-13 10:14 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Doug Ledford, Jason Gunthorpe, linux-rdma, kernel-janitors
On Wed, May 13, 2020 at 01:00:31PM +0300, Leon Romanovsky wrote:
> On Wed, May 13, 2020 at 12:37:41PM +0300, Dan Carpenter wrote:
> > The "srq_out" pointer is never freed so that causes a memory leak. It's
> > never used and can be deleted. Freeing "out" will lead to a double in
> > mlx5_ib_query_srq().
> >
> > Fixes: 31578defe4eb ("RDMA/mlx5: Update mlx5_ib to use new cmd interface")
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > ---
> > drivers/infiniband/hw/mlx5/srq_cmd.c | 11 ++---------
> > 1 file changed, 2 insertions(+), 9 deletions(-)
> >
>
> Thanks for the report, the change should be slightly different.
>
> I'm sending fix right now.
https://lore.kernel.org/linux-rdma/20200513100809.246315-1-leon@kernel.org
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] RDMA/mlx5: Fix query_srq_cmd() function
@ 2020-05-13 10:14 ` Leon Romanovsky
0 siblings, 0 replies; 6+ messages in thread
From: Leon Romanovsky @ 2020-05-13 10:14 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Doug Ledford, Jason Gunthorpe, linux-rdma, kernel-janitors
On Wed, May 13, 2020 at 01:00:31PM +0300, Leon Romanovsky wrote:
> On Wed, May 13, 2020 at 12:37:41PM +0300, Dan Carpenter wrote:
> > The "srq_out" pointer is never freed so that causes a memory leak. It's
> > never used and can be deleted. Freeing "out" will lead to a double in
> > mlx5_ib_query_srq().
> >
> > Fixes: 31578defe4eb ("RDMA/mlx5: Update mlx5_ib to use new cmd interface")
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > ---
> > drivers/infiniband/hw/mlx5/srq_cmd.c | 11 ++---------
> > 1 file changed, 2 insertions(+), 9 deletions(-)
> >
>
> Thanks for the report, the change should be slightly different.
>
> I'm sending fix right now.
https://lore.kernel.org/linux-rdma/20200513100809.246315-1-leon@kernel.org
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-05-13 10:14 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-13 9:37 [PATCH] RDMA/mlx5: Fix query_srq_cmd() function Dan Carpenter
2020-05-13 9:37 ` Dan Carpenter
2020-05-13 10:00 ` Leon Romanovsky
2020-05-13 10:00 ` Leon Romanovsky
2020-05-13 10:14 ` Leon Romanovsky
2020-05-13 10:14 ` Leon Romanovsky
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.