block/rnbd: 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.

Signed-off-by: Dima Stepanov <dmitrii.stepanov@cloud.ionos.com>
Signed-off-by: Jack Wang <jinpu.wang@ionos.com>
Signed-off-by: Gioh Kim <gi-oh.kim@ionos.com>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Link: https://lore.kernel.org/r/20210419073722.15351-20-gi-oh.kim@ionos.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/rnbd/rnbd-clt-sysfs.c b/drivers/block/rnbd/rnbd-clt-sysfs.c
index 042566b..324afdd 100644 (file)
--- a/drivers/block/rnbd/rnbd-clt-sysfs.c
+++ b/drivers/block/rnbd/rnbd-clt-sysfs.c
@@ -99,7 +99,7 @@ static int rnbd_clt_parse_map_options(const char *buf, size_t max_path_cnt,
                                kfree(p);
                                goto out;
                        }
-                       strlcpy(opt->sessname, p, NAME_MAX);
+                       strscpy(opt->sessname, p, NAME_MAX);
                        kfree(p);
                        break;
 
@@ -142,7 +142,7 @@ static int rnbd_clt_parse_map_options(const char *buf, size_t max_path_cnt,
                                kfree(p);
                                goto out;
                        }
-                       strlcpy(opt->pathname, p, NAME_MAX);
+                       strscpy(opt->pathname, p, NAME_MAX);
                        kfree(p);
                        break;
 
@@ -510,7 +510,7 @@ static int rnbd_clt_get_path_name(struct rnbd_clt_dev *dev, char *buf,
        int ret;
        char pathname[NAME_MAX], *s;
 
-       strlcpy(pathname, dev->pathname, sizeof(pathname));
+       strscpy(pathname, dev->pathname, sizeof(pathname));
        while ((s = strchr(pathname, '/')))
                s[0] = '!';
 

diff --git a/drivers/block/rnbd/rnbd-clt.c b/drivers/block/rnbd/rnbd-clt.c
index 95381e6..c01786a 100644 (file)
--- a/drivers/block/rnbd/rnbd-clt.c
+++ b/drivers/block/rnbd/rnbd-clt.c
@@ -578,7 +578,7 @@ static int send_msg_open(struct rnbd_clt_dev *dev, enum wait_type wait)
 
        msg.hdr.type    = cpu_to_le16(RNBD_MSG_OPEN);
        msg.access_mode = dev->access_mode;
-       strlcpy(msg.dev_name, dev->pathname, sizeof(msg.dev_name));
+       strscpy(msg.dev_name, dev->pathname, sizeof(msg.dev_name));
 
        WARN_ON(!rnbd_clt_get_dev(dev));
        err = send_usr_msg(sess->rtrs, READ, iu,
@@ -800,7 +800,7 @@ static struct rnbd_clt_session *alloc_sess(const char *sessname)
        sess = kzalloc_node(sizeof(*sess), GFP_KERNEL, NUMA_NO_NODE);
        if (!sess)
                return ERR_PTR(-ENOMEM);
-       strlcpy(sess->sessname, sessname, sizeof(sess->sessname));
+       strscpy(sess->sessname, sessname, sizeof(sess->sessname));
        atomic_set(&sess->busy, 0);
        mutex_init(&sess->lock);
        INIT_LIST_HEAD(&sess->devs_list);

diff --git a/drivers/block/rnbd/rnbd-srv.c b/drivers/block/rnbd/rnbd-srv.c
index abacd9e..899dd9d 100644 (file)
--- a/drivers/block/rnbd/rnbd-srv.c
+++ b/drivers/block/rnbd/rnbd-srv.c
@@ -298,7 +298,7 @@ static int create_sess(struct rtrs_srv *rtrs)
        mutex_unlock(&sess_lock);
 
        srv_sess->rtrs = rtrs;
-       strlcpy(srv_sess->sessname, sessname, sizeof(srv_sess->sessname));
+       strscpy(srv_sess->sessname, sessname, sizeof(srv_sess->sessname));
 
        rtrs_srv_set_sess_priv(rtrs, srv_sess);
 
@@ -437,7 +437,7 @@ static struct rnbd_srv_dev *rnbd_srv_init_srv_dev(const char *id)
        if (!dev)
                return ERR_PTR(-ENOMEM);
 
-       strlcpy(dev->id, id, sizeof(dev->id));
+       strscpy(dev->id, id, sizeof(dev->id));
        kref_init(&dev->kref);
        INIT_LIST_HEAD(&dev->sess_dev_list);
        mutex_init(&dev->lock);
@@ -589,7 +589,7 @@ rnbd_srv_create_set_sess_dev(struct rnbd_srv_session *srv_sess,
 
        kref_init(&sdev->kref);
 
-       strlcpy(sdev->pathname, open_msg->dev_name, sizeof(sdev->pathname));
+       strscpy(sdev->pathname, open_msg->dev_name, sizeof(sdev->pathname));
 
        sdev->rnbd_dev          = rnbd_dev;
        sdev->sess              = srv_sess;