Skip to contentSkip to conversation

RDMA/mlx5: Fix query_srq_cmd() function

PATCH In review Dan Carpenter 2 participants 3 messages May 13, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 RDMA/mlx5: Fix query_srq_cmd() function

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")
---
 drivers/infiniband/hw/mlx5/srq_cmd.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
drivers/infiniband/hw/mlx5/srq_cmd.c +2 -9
index bc50a712bf2ed..ee85b8087a718 100644
@@ -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,
Signature · 1 line
2.26.2
#1 lore raw
Quoted 10 lines · Dan Carpenter

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")
---
 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.

#2 lore raw
Quoted 12 lines · Leon Romanovsky
Quoted 10 lines · Dan Carpenter

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")
---
 drivers/infiniband/hw/mlx5/srq_cmd.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
Quoted 3 lines

Thanks for the report, the change should be slightly different.

I'm sending fix right now.

https://lore.kernel.org/linux-rdma/[email protected]