1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index ec737e2287fe..03c418ccbc98 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -844,6 +844,8 @@ static struct ib_ucontext *mlx5_ib_alloc_ucontext(struct ib_device *ibdev,
         int err;
         int i;
         size_t reqlen;
+        size_t min_req_v2 = offsetof(struct mlx5_ib_alloc_ucontext_req_v2,
+                                     max_cqe_version);
 
         if (!dev->ib_active)
                 return ERR_PTR(-EAGAIN);
@@ -854,7 +856,7 @@ static struct ib_ucontext *mlx5_ib_alloc_ucontext(struct ib_device *ibdev,
         reqlen = udata->inlen - sizeof(struct ib_uverbs_cmd_hdr);
         if (reqlen == sizeof(struct mlx5_ib_alloc_ucontext_req))
                 ver = 0;
-        else if (reqlen >= sizeof(struct mlx5_ib_alloc_ucontext_req_v2))
+        else if (reqlen >= min_req_v2)
                 ver = 2;
         else
                 return ERR_PTR(-EINVAL);
@@ -2214,7 +2216,9 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev)
                 (1ull << IB_USER_VERBS_CMD_CREATE_XSRQ)         |
                 (1ull << IB_USER_VERBS_CMD_OPEN_QP);
         dev->ib_dev.uverbs_ex_cmd_mask =
-                (1ull << IB_USER_VERBS_EX_CMD_QUERY_DEVICE);
+                (1ull << IB_USER_VERBS_EX_CMD_QUERY_DEVICE)     |
+                (1ull << IB_USER_VERBS_EX_CMD_CREATE_CQ)        |
+                (1ull << IB_USER_VERBS_EX_CMD_CREATE_QP);
 
         dev->ib_dev.query_device        = mlx5_ib_query_device;
         dev->ib_dev.query_port          = mlx5_ib_query_port;