RDMA/rtrs: Only allow addition of path to an already established session

[ Upstream commit 03e9b33a0fd677f554b03352646c13459bf60458 ]

While adding a path from the client side to an already established
session, it was possible to provide the destination IP to a different
server. This is dangerous.

This commit adds an extra member to the rtrs_msg_conn_req structure, named
first_conn; which is supposed to notify if the connection request is the
first for that session or not.

On the server side, if a session does not exist but the first_conn
received inside the rtrs_msg_conn_req structure is 1, the connection
request is failed. This signifies that the connection request is for an
already existing session, and since the server did not find one, it is an
wrong connection request.

Fixes: 6a98d71daea1 ("RDMA/rtrs: client: main functionality")
Fixes: 9cb837480424 ("RDMA/rtrs: server: main functionality")
Link: https://lore.kernel.org/r/20210212134525.103456-3-jinpu.wang@cloud.ionos.com
Signed-off-by: Md Haris Iqbal <haris.iqbal@cloud.ionos.com>
Reviewed-by: Lutz Pogrell <lutz.pogrell@cloud.ionos.com>
Signed-off-by: Jack Wang <jinpu.wang@cloud.ionos.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/infiniband/ulp/rtrs/rtrs-clt.c b/drivers/infiniband/ulp/rtrs/rtrs-clt.c
index 6115db7ca20308fb3bc4a11ebeb89372c6def89c..fc0e90915678ae7c7c8501cb2df9493931f18bda 100644 (file)
--- a/drivers/infiniband/ulp/rtrs/rtrs-clt.c
+++ b/drivers/infiniband/ulp/rtrs/rtrs-clt.c
@@ -31,6 +31,8 @@
  */
 #define RTRS_RECONNECT_SEED 8
 
+#define FIRST_CONN 0x01
+
 MODULE_DESCRIPTION("RDMA Transport Client");
 MODULE_LICENSE("GPL");
 
@@ -1674,6 +1676,7 @@ static int rtrs_rdma_route_resolved(struct rtrs_clt_con *con)
                .cid_num = cpu_to_le16(sess->s.con_num),
                .recon_cnt = cpu_to_le16(sess->s.recon_cnt),
        };
+       msg.first_conn = sess->for_new_clt ? FIRST_CONN : 0;
        uuid_copy(&msg.sess_uuid, &sess->s.uuid);
        uuid_copy(&msg.paths_uuid, &clt->paths_uuid);
 
@@ -1759,6 +1762,8 @@ static int rtrs_rdma_conn_established(struct rtrs_clt_con *con,
                scnprintf(sess->hca_name, sizeof(sess->hca_name),
                          sess->s.dev->ib_dev->name);
                sess->s.src_addr = con->c.cm_id->route.addr.src_addr;
+               /* set for_new_clt, to allow future reconnect on any path */
+               sess->for_new_clt = 1;
        }
 
        return 0;
@@ -2682,6 +2687,8 @@ struct rtrs_clt *rtrs_clt_open(struct rtrs_clt_ops *ops,
                        err = PTR_ERR(sess);
                        goto close_all_sess;
                }
+               if (!i)
+                       sess->for_new_clt = 1;
                list_add_tail_rcu(&sess->s.entry, &clt->paths_list);
 
                err = init_sess(sess);

diff --git a/drivers/infiniband/ulp/rtrs/rtrs-clt.h b/drivers/infiniband/ulp/rtrs/rtrs-clt.h
index 167acd3c90fcceebc07902bd128340da6b7ccf4f..22da5d50c22c4ac0f7fdf6232c1b52f8d66742d6 100644 (file)
--- a/drivers/infiniband/ulp/rtrs/rtrs-clt.h
+++ b/drivers/infiniband/ulp/rtrs/rtrs-clt.h
@@ -142,6 +142,7 @@ struct rtrs_clt_sess {
        int                     max_send_sge;
        u32                     flags;
        struct kobject          kobj;
+       u8                      for_new_clt;
        struct rtrs_clt_stats   *stats;
        /* cache hca_port and hca_name to display in sysfs */
        u8                      hca_port;

diff --git a/drivers/infiniband/ulp/rtrs/rtrs-pri.h b/drivers/infiniband/ulp/rtrs/rtrs-pri.h
index 32de7ad4a07648897c63e97d777b14e9bace448b..2e1d2f7e372acada4c13cd4edad9f39c6db8a63a 100644 (file)
--- a/drivers/infiniband/ulp/rtrs/rtrs-pri.h
+++ b/drivers/infiniband/ulp/rtrs/rtrs-pri.h
@@ -188,7 +188,9 @@ struct rtrs_msg_conn_req {
        __le16          recon_cnt;
        uuid_t          sess_uuid;
        uuid_t          paths_uuid;
-       u8              reserved[12];
+       u8              first_conn : 1;
+       u8              reserved_bits : 7;
+       u8              reserved[11];
 };
 
 /**

diff --git a/drivers/infiniband/ulp/rtrs/rtrs-srv.c b/drivers/infiniband/ulp/rtrs/rtrs-srv.c
index 75e1e89e09b38fb9999a2ad262ae18d495aa1edb..332418245dce376fb1169534141ee31c94532579 100644 (file)
--- a/drivers/infiniband/ulp/rtrs/rtrs-srv.c
+++ b/drivers/infiniband/ulp/rtrs/rtrs-srv.c
@@ -1350,7 +1350,8 @@ static void free_srv(struct rtrs_srv *srv)
 }
 
 static struct rtrs_srv *get_or_create_srv(struct rtrs_srv_ctx *ctx,
-                                          const uuid_t *paths_uuid)
+                                         const uuid_t *paths_uuid,
+                                         bool first_conn)
 {
        struct rtrs_srv *srv;
        int i;
@@ -1363,12 +1364,20 @@ static struct rtrs_srv *get_or_create_srv(struct rtrs_srv_ctx *ctx,
                        return srv;
                }
        }
+       /*
+        * If this request is not the first connection request from the
+        * client for this session then fail and return error.
+        */
+       if (!first_conn) {
+               mutex_unlock(&ctx->srv_mutex);
+               return ERR_PTR(-ENXIO);
+       }
 
        /* need to allocate a new srv */
        srv = kzalloc(sizeof(*srv), GFP_KERNEL);
        if  (!srv) {
                mutex_unlock(&ctx->srv_mutex);
-               return NULL;
+               return ERR_PTR(-ENOMEM);
        }
 
        INIT_LIST_HEAD(&srv->paths_list);
@@ -1403,7 +1412,7 @@ err_free_chunks:
 
 err_free_srv:
        kfree(srv);
-       return NULL;
+       return ERR_PTR(-ENOMEM);
 }
 
 static void put_srv(struct rtrs_srv *srv)
@@ -1804,13 +1813,13 @@ static int rtrs_rdma_connect(struct rdma_cm_id *cm_id,
                goto reject_w_econnreset;
        }
        recon_cnt = le16_to_cpu(msg->recon_cnt);
-       srv = get_or_create_srv(ctx, &msg->paths_uuid);
+       srv = get_or_create_srv(ctx, &msg->paths_uuid, msg->first_conn);
        /*
         * "refcount == 0" happens if a previous thread calls get_or_create_srv
         * allocate srv, but chunks of srv are not allocated yet.
         */
-       if (!srv || refcount_read(&srv->refcount) == 0) {
-               err = -ENOMEM;
+       if (IS_ERR(srv) || refcount_read(&srv->refcount) == 0) {
+               err = PTR_ERR(srv);
                goto reject_w_err;
        }
        mutex_lock(&srv->paths_mutex);