misc: 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>
Link: https://lore.kernel.org/r/20220818210031.7036-1-wsa+renesas@sang-engineering.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/altera-stapl/altera.c b/drivers/misc/altera-stapl/altera.c
index 075f3a3..a58b7cb 100644 (file)
--- a/drivers/misc/altera-stapl/altera.c
+++ b/drivers/misc/altera-stapl/altera.c
@@ -1014,7 +1014,7 @@ exit_done:
                         * ...argument 0 is string ID
                         */
                        count = strlen(msg_buff);
-                       strlcpy(&msg_buff[count],
+                       strscpy(&msg_buff[count],
                                &p[str_table + args[0]],
                                ALTERA_MESSAGE_LENGTH - count);
                        break;
@@ -2146,7 +2146,7 @@ static int altera_get_note(u8 *p, s32 program_size, s32 *offset,
                                                &p[note_table + (8 * i) + 4])];
 
                                if (value != NULL)
-                                       strlcpy(value, value_ptr, vallen);
+                                       strscpy(value, value_ptr, vallen);
 
                        }
                }
@@ -2162,13 +2162,13 @@ static int altera_get_note(u8 *p, s32 program_size, s32 *offset,
                        status = 0;
 
                        if (key != NULL)
-                               strlcpy(key, &p[note_strings +
+                               strscpy(key, &p[note_strings +
                                                get_unaligned_be32(
                                                &p[note_table + (8 * i)])],
                                        keylen);
 
                        if (value != NULL)
-                               strlcpy(value, &p[note_strings +
+                               strscpy(value, &p[note_strings +
                                                get_unaligned_be32(
                                                &p[note_table + (8 * i) + 4])],
                                        vallen);

diff --git a/drivers/misc/eeprom/eeprom.c b/drivers/misc/eeprom/eeprom.c
index 34fa385..adb08ae 100644 (file)
--- a/drivers/misc/eeprom/eeprom.c
+++ b/drivers/misc/eeprom/eeprom.c
@@ -136,7 +136,7 @@ static int eeprom_detect(struct i2c_client *client, struct i2c_board_info *info)
         && !i2c_check_functionality(adapter, I2C_FUNC_SMBUS_READ_I2C_BLOCK))
                return -ENODEV;
 
-       strlcpy(info->type, "eeprom", I2C_NAME_SIZE);
+       strscpy(info->type, "eeprom", I2C_NAME_SIZE);
 
        return 0;
 }

diff --git a/drivers/misc/eeprom/idt_89hpesx.c b/drivers/misc/eeprom/idt_89hpesx.c
index 9aec333..01614fe 100644 (file)
--- a/drivers/misc/eeprom/idt_89hpesx.c
+++ b/drivers/misc/eeprom/idt_89hpesx.c
@@ -1075,7 +1075,7 @@ static const struct i2c_device_id *idt_ee_match_id(struct fwnode_handle *fwnode)
                return NULL;
 
        p = strchr(compatible, ',');
-       strlcpy(devname, p ? p + 1 : compatible, sizeof(devname));
+       strscpy(devname, p ? p + 1 : compatible, sizeof(devname));
        /* Search through the device name */
        while (id->name[0]) {
                if (strcmp(devname, id->name) == 0)

diff --git a/drivers/misc/ics932s401.c b/drivers/misc/ics932s401.c
index 0f9ea75..d88fe13 100644 (file)
--- a/drivers/misc/ics932s401.c
+++ b/drivers/misc/ics932s401.c
@@ -424,7 +424,7 @@ static int ics932s401_detect(struct i2c_client *client,
        if (revision != ICS932S401_REV)
                dev_info(&adapter->dev, "Unknown revision %d\n", revision);
 
-       strlcpy(info->type, "ics932s401", I2C_NAME_SIZE);
+       strscpy(info->type, "ics932s401", I2C_NAME_SIZE);
 
        return 0;
 }

diff --git a/drivers/misc/mei/bus-fixup.c b/drivers/misc/mei/bus-fixup.c
index 59506ba..4cb341f 100644 (file)
--- a/drivers/misc/mei/bus-fixup.c
+++ b/drivers/misc/mei/bus-fixup.c
@@ -471,7 +471,7 @@ static void mei_nfc(struct mei_cl_device *cldev)
        }
 
        dev_dbg(bus->dev, "nfc radio %s\n", radio_name);
-       strlcpy(cldev->name, radio_name, sizeof(cldev->name));
+       strscpy(cldev->name, radio_name, sizeof(cldev->name));
 
 disconnect:
        mutex_lock(&bus->device_lock);