block: move from strlcpy with unused retval to strscpy

Follow the advice of the below link and prefer 'strscpy' in this
subsystem. Conversion is 1:1 because the return value is not used.
Generated by a coccinelle script.

Link: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Christoph Böhmwalder <christoph.boehmwalder@linbit.com>
Acked-by: Geoff Levand <geoff@infradead.org>
Link: https://lore.kernel.org/r/20220818205958.6552-1-wsa+renesas@sang-engineering.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index 859499cd1ff8e405b2ea3c4dfd94ddc8bfa5970c..20acc4a1fd6def4eddbbf63d6d581734f4f9dee9 100644 (file)
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -397,7 +397,7 @@ static int brd_alloc(int i)
        disk->minors            = max_part;
        disk->fops              = &brd_fops;
        disk->private_data      = brd;
-       strlcpy(disk->disk_name, buf, DISK_NAME_LEN);
+       strscpy(disk->disk_name, buf, DISK_NAME_LEN);
        set_capacity(disk, rd_size * 2);
        
        /*

diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 013d355a2033bd61f7e20650bf4e64e301ccd479..864c98e748757dd615163091f597be66bf6b4219 100644 (file)
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -4752,7 +4752,7 @@ void notify_helper(enum drbd_notification_type type,
        struct drbd_genlmsghdr *dh;
        int err;
 
-       strlcpy(helper_info.helper_name, name, sizeof(helper_info.helper_name));
+       strscpy(helper_info.helper_name, name, sizeof(helper_info.helper_name));
        helper_info.helper_name_len = min(strlen(name), sizeof(helper_info.helper_name));
        helper_info.helper_status = status;
 

diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index 562725d222a7b95a1cde8ed194e04d55bce336d5..815d77ba63819e27da91160b06b27fee32f4b6af 100644 (file)
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -1397,15 +1397,15 @@ static void mtip_dump_identify(struct mtip_port *port)
        if (!port->identify_valid)
                return;
 
-       strlcpy(cbuf, (char *)(port->identify+10), 21);
+       strscpy(cbuf, (char *)(port->identify + 10), 21);
        dev_info(&port->dd->pdev->dev,
                "Serial No.: %s\n", cbuf);
 
-       strlcpy(cbuf, (char *)(port->identify+23), 9);
+       strscpy(cbuf, (char *)(port->identify + 23), 9);
        dev_info(&port->dd->pdev->dev,
                "Firmware Ver.: %s\n", cbuf);
 
-       strlcpy(cbuf, (char *)(port->identify+27), 41);
+       strscpy(cbuf, (char *)(port->identify + 27), 41);
        dev_info(&port->dd->pdev->dev, "Model: %s\n", cbuf);
 
        dev_info(&port->dd->pdev->dev, "Security: %04x %s\n",
@@ -1421,13 +1421,13 @@ static void mtip_dump_identify(struct mtip_port *port)
        pci_read_config_word(port->dd->pdev, PCI_REVISION_ID, &revid);
        switch (revid & 0xFF) {
        case 0x1:
-               strlcpy(cbuf, "A0", 3);
+               strscpy(cbuf, "A0", 3);
                break;
        case 0x3:
-               strlcpy(cbuf, "A2", 3);
+               strscpy(cbuf, "A2", 3);
                break;
        default:
-               strlcpy(cbuf, "?", 2);
+               strscpy(cbuf, "?", 2);
                break;
        }
        dev_info(&port->dd->pdev->dev,

diff --git a/drivers/block/ps3vram.c b/drivers/block/ps3vram.c
index e1d080f680edfdd257e49f8ba3d69429be9e12a0..c76e0148eada3302a04b81a886fa7cdb34df2de1 100644 (file)
--- a/drivers/block/ps3vram.c
+++ b/drivers/block/ps3vram.c
@@ -745,7 +745,7 @@ static int ps3vram_probe(struct ps3_system_bus_device *dev)
        gendisk->flags |= GENHD_FL_NO_PART;
        gendisk->fops = &ps3vram_fops;
        gendisk->private_data = dev;
-       strlcpy(gendisk->disk_name, DEVICE_NAME, sizeof(gendisk->disk_name));
+       strscpy(gendisk->disk_name, DEVICE_NAME, sizeof(gendisk->disk_name));
        set_capacity(gendisk, priv->size >> 9);
        blk_queue_max_segments(gendisk->queue, BLK_MAX_SEGMENTS);
        blk_queue_max_segment_size(gendisk->queue, BLK_MAX_SEGMENT_SIZE);

diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 92cb929a45b79ae26090233cb83c300b5c937655..be435304af29f61cafc6fe1680c9deb3b5f222ff 100644 (file)
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -499,7 +499,7 @@ static ssize_t backing_dev_store(struct device *dev,
                goto out;
        }
 
-       strlcpy(file_name, buf, PATH_MAX);
+       strscpy(file_name, buf, PATH_MAX);
        /* ignore trailing newline */
        sz = strlen(file_name);
        if (sz > 0 && file_name[sz - 1] == '\n')
@@ -1031,7 +1031,7 @@ static ssize_t comp_algorithm_store(struct device *dev,
        char compressor[ARRAY_SIZE(zram->compressor)];
        size_t sz;
 
-       strlcpy(compressor, buf, sizeof(compressor));
+       strscpy(compressor, buf, sizeof(compressor));
        /* ignore trailing newline */
        sz = strlen(compressor);
        if (sz > 0 && compressor[sz - 1] == '\n')
@@ -1952,7 +1952,7 @@ static int zram_add(void)
        if (ret)
                goto out_cleanup_disk;
 
-       strlcpy(zram->compressor, default_compressor, sizeof(zram->compressor));
+       strscpy(zram->compressor, default_compressor, sizeof(zram->compressor));
 
        zram_debugfs_register(zram);
        pr_info("Added device: %s\n", zram->disk->disk_name);