mtd: 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>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20220818210033.7084-1-wsa+renesas@sang-engineering.com

diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
index 40d7211..4cd37ec 100644 (file)
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
@@ -461,7 +461,7 @@ static int block2mtd_setup(const char *val, const struct kernel_param *kp)
           the device (even kmalloc() fails). Deter that work to
           block2mtd_setup2(). */
 
-       strlcpy(block2mtd_paramline, val, sizeof(block2mtd_paramline));
+       strscpy(block2mtd_paramline, val, sizeof(block2mtd_paramline));
 
        return 0;
 #endif

diff --git a/drivers/mtd/parsers/cmdlinepart.c b/drivers/mtd/parsers/cmdlinepart.c
index 0ddff1a..b34856d 100644 (file)
--- a/drivers/mtd/parsers/cmdlinepart.c
+++ b/drivers/mtd/parsers/cmdlinepart.c
@@ -193,7 +193,7 @@ static struct mtd_partition * newpart(char *s,
        parts[this_part].mask_flags = mask_flags;
        parts[this_part].add_flags = add_flags;
        if (name)
-               strlcpy(extra_mem, name, name_len + 1);
+               strscpy(extra_mem, name, name_len + 1);
        else
                sprintf(extra_mem, "Partition_%03d", this_part);
        parts[this_part].name = extra_mem;
@@ -298,7 +298,7 @@ static int mtdpart_setup_real(char *s)
                this_mtd->parts = parts;
                this_mtd->num_parts = num_parts;
                this_mtd->mtd_id = (char*)(this_mtd + 1);
-               strlcpy(this_mtd->mtd_id, mtd_id, mtd_id_len + 1);
+               strscpy(this_mtd->mtd_id, mtd_id, mtd_id_len + 1);
 
                /* link into chain */
                this_mtd->next = partitions;