RDMA/rtrs: Use strscpy instead of strlcpy

During checkpatch analyzing the following warning message was found:
  WARNING:STRLCPY: Prefer strscpy over strlcpy - see:
  https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/
Fix it by using strscpy calls instead of strlcpy.

Link: https://lore.kernel.org/r/20210528113018.52290-8-jinpu.wang@ionos.com
Signed-off-by: Dima Stepanov <dmitrii.stepanov@ionos.com>
Signed-off-by: Gioh Kim <gi-oh.kim@ionos.com>
Signed-off-by: Jack Wang <jinpu.wang@ionos.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/drivers/infiniband/ulp/rtrs/rtrs-clt.c b/drivers/infiniband/ulp/rtrs/rtrs-clt.c
index 97fa9da4dde4efaf6b040957a0d15a85df8fb2f3..f2005e57ea53b85413f2f88a1ec11c7036378c10 100644 (file)
--- a/drivers/infiniband/ulp/rtrs/rtrs-clt.c
+++ b/drivers/infiniband/ulp/rtrs/rtrs-clt.c
@@ -1505,7 +1505,7 @@ static struct rtrs_clt_sess *alloc_sess(struct rtrs_clt *clt,
        if (path->src)
                memcpy(&sess->s.src_addr, path->src,
                       rdma_addr_size((struct sockaddr *)path->src));
-       strlcpy(sess->s.sessname, clt->sessname, sizeof(sess->s.sessname));
+       strscpy(sess->s.sessname, clt->sessname, sizeof(sess->s.sessname));
        sess->clt = clt;
        sess->max_pages_per_mr = max_segments;
        init_waitqueue_head(&sess->state_wq);
@@ -2652,7 +2652,7 @@ static struct rtrs_clt *alloc_clt(const char *sessname, size_t paths_num,
        clt->priv = priv;
        clt->link_ev = link_ev;
        clt->mp_policy = MP_POLICY_MIN_INFLIGHT;
-       strlcpy(clt->sessname, sessname, sizeof(clt->sessname));
+       strscpy(clt->sessname, sessname, sizeof(clt->sessname));
        init_waitqueue_head(&clt->permits_wait);
        mutex_init(&clt->paths_ev_mutex);
        mutex_init(&clt->paths_mutex);

diff --git a/drivers/infiniband/ulp/rtrs/rtrs-srv.c b/drivers/infiniband/ulp/rtrs/rtrs-srv.c
index 5cfc2e3f9596bff8b3104328d1152c916e0a9746..2ba6658c5e35de8eb789c2ca9a30201f9ebf412c 100644 (file)
--- a/drivers/infiniband/ulp/rtrs/rtrs-srv.c
+++ b/drivers/infiniband/ulp/rtrs/rtrs-srv.c
@@ -780,7 +780,7 @@ static int process_info_req(struct rtrs_srv_con *con,
        rwr = kcalloc(sess->mrs_num, sizeof(*rwr), GFP_KERNEL);
        if (unlikely(!rwr))
                return -ENOMEM;
-       strlcpy(sess->s.sessname, msg->sessname, sizeof(sess->s.sessname));
+       strscpy(sess->s.sessname, msg->sessname, sizeof(sess->s.sessname));
 
        tx_sz  = sizeof(*rsp);
        tx_sz += sizeof(rsp->desc[0]) * sess->mrs_num;
@@ -1261,7 +1261,7 @@ int rtrs_srv_get_sess_name(struct rtrs_srv *srv, char *sessname, size_t len)
        list_for_each_entry(sess, &srv->paths_list, s.entry) {
                if (sess->state != RTRS_SRV_CONNECTED)
                        continue;
-               strlcpy(sessname, sess->s.sessname,
+               strscpy(sessname, sess->s.sessname,
                       min_t(size_t, sizeof(sess->s.sessname), len));
                err = 0;
                break;
@@ -1715,7 +1715,7 @@ static struct rtrs_srv_sess *__alloc_sess(struct rtrs_srv *srv,
        path.src = &sess->s.src_addr;
        path.dst = &sess->s.dst_addr;
        rtrs_addr_to_str(&path, str, sizeof(str));
-       strlcpy(sess->s.sessname, str, sizeof(sess->s.sessname));
+       strscpy(sess->s.sessname, str, sizeof(sess->s.sessname));
 
        sess->s.con_num = con_num;
        sess->s.recon_cnt = recon_cnt;