[PATCH rdma-rc] RDMA/mlx5: Fix udata response upon SRQ creation

[PATCH rdma-rc] RDMA/mlx5: Fix udata response upon SRQ creation

[Leon Romanovsky]

From: Yishai Hadas <yishaih@mellanox.com>

Fix udata response upon SRQ creation to use the UAPI structure (i.e.
mlx5_ib_create_srq_resp).

Fixes: e126ba97dba9 ("mlx5: Add driver for Mellanox Connect-IB adapters")
Signed-off-by: Yishai Hadas <yishaih@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
---
 drivers/infiniband/hw/mlx5/srq.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/infiniband/hw/mlx5/srq.c b/drivers/infiniband/hw/mlx5/srq.c
index b1a8a9175040..3c2a84c362bb 100644
--- a/drivers/infiniband/hw/mlx5/srq.c
+++ b/drivers/infiniband/hw/mlx5/srq.c
@@ -310,12 +310,17 @@ int mlx5_ib_create_srq(struct ib_srq *ib_srq,
 	srq->msrq.event = mlx5_ib_srq_event;
 	srq->ibsrq.ext.xrc.srq_num = srq->msrq.srqn;

-	if (udata)
-		if (ib_copy_to_udata(udata, &srq->msrq.srqn, sizeof(__u32))) {
+	if (udata) {
+		struct mlx5_ib_create_srq_resp resp = {};
+
+		resp.srqn = srq->msrq.srqn;
+		if (ib_copy_to_udata(udata, &resp, min(udata->outlen,
+				     sizeof(resp)))) {
 			mlx5_ib_dbg(dev, "copy to user failed\n");
 			err = -EFAULT;
 			goto err_core;
 		}
+	}

 	init_attr->attr.max_wr = srq->msrq.max - 1;

--
2.25.1

Re: [PATCH rdma-rc] RDMA/mlx5: Fix udata response upon SRQ creation

[Jason Gunthorpe]

On Mon, Apr 06, 2020 at 08:35:40PM +0300, Leon Romanovsky wrote:
> From: Yishai Hadas <yishaih@mellanox.com>
> 
> Fix udata response upon SRQ creation to use the UAPI structure (i.e.
> mlx5_ib_create_srq_resp).
> 
> Fixes: e126ba97dba9 ("mlx5: Add driver for Mellanox Connect-IB adapters")
> Signed-off-by: Yishai Hadas <yishaih@mellanox.com>
> Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
> ---
>  drivers/infiniband/hw/mlx5/srq.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)

This isn't really a -rc issue, applied to for-next, thanks

Jason