IB/cm: Match connection requests based on private data

Extend matching connection requests to listens in the InfiniBand CM to
include private data checks.

This allows applications to listen on the same service identifier,
with private data directing the request to the appropriate application.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

1 files changed, 18 insertions, 1 deletions

diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c
index b396bf703f8..0136aee0faa 100644
--- a/drivers/infiniband/core/ucm.c
+++ b/drivers/infiniband/core/ucm.c
@@ -648,6 +648,17 @@ out:
         return result;
 }
 
+static int ucm_validate_listen(__be64 service_id, __be64 service_mask)
+{
+        service_id &= service_mask;
+
+        if (((service_id & IB_CMA_SERVICE_ID_MASK) == IB_CMA_SERVICE_ID) ||
+            ((service_id & IB_SDP_SERVICE_ID_MASK) == IB_SDP_SERVICE_ID))
+                return -EINVAL;
+
+        return 0;
+}
+
 static ssize_t ib_ucm_listen(struct ib_ucm_file *file,
                              const char __user *inbuf,
                              int in_len, int out_len)
@@ -663,7 +674,13 @@ static ssize_t ib_ucm_listen(struct ib_ucm_file *file,
         if (IS_ERR(ctx))
                 return PTR_ERR(ctx);
 
-        result = ib_cm_listen(ctx->cm_id, cmd.service_id, cmd.service_mask);
+        result = ucm_validate_listen(cmd.service_id, cmd.service_mask);
+        if (result)
+                goto out;
+
+        result = ib_cm_listen(ctx->cm_id, cmd.service_id, cmd.service_mask,
+                              NULL);
+out:
         ib_ucm_ctx_put(ctx);
         return result;
 }