Commit 5192e395 authored by Wolfram Sang's avatar Wolfram Sang Committed by Greg Kroah-Hartman

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: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20220818210031.7036-1-wsa+renesas@sang-engineering.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f667f56b
...@@ -1014,7 +1014,7 @@ static int altera_execute(struct altera_state *astate, ...@@ -1014,7 +1014,7 @@ static int altera_execute(struct altera_state *astate,
* ...argument 0 is string ID * ...argument 0 is string ID
*/ */
count = strlen(msg_buff); count = strlen(msg_buff);
strlcpy(&msg_buff[count], strscpy(&msg_buff[count],
&p[str_table + args[0]], &p[str_table + args[0]],
ALTERA_MESSAGE_LENGTH - count); ALTERA_MESSAGE_LENGTH - count);
break; break;
...@@ -2146,7 +2146,7 @@ static int altera_get_note(u8 *p, s32 program_size, s32 *offset, ...@@ -2146,7 +2146,7 @@ static int altera_get_note(u8 *p, s32 program_size, s32 *offset,
&p[note_table + (8 * i) + 4])]; &p[note_table + (8 * i) + 4])];
if (value != NULL) 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, ...@@ -2162,13 +2162,13 @@ static int altera_get_note(u8 *p, s32 program_size, s32 *offset,
status = 0; status = 0;
if (key != NULL) if (key != NULL)
strlcpy(key, &p[note_strings + strscpy(key, &p[note_strings +
get_unaligned_be32( get_unaligned_be32(
&p[note_table + (8 * i)])], &p[note_table + (8 * i)])],
keylen); keylen);
if (value != NULL) if (value != NULL)
strlcpy(value, &p[note_strings + strscpy(value, &p[note_strings +
get_unaligned_be32( get_unaligned_be32(
&p[note_table + (8 * i) + 4])], &p[note_table + (8 * i) + 4])],
vallen); vallen);
......
...@@ -136,7 +136,7 @@ static int eeprom_detect(struct i2c_client *client, struct i2c_board_info *info) ...@@ -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)) && !i2c_check_functionality(adapter, I2C_FUNC_SMBUS_READ_I2C_BLOCK))
return -ENODEV; return -ENODEV;
strlcpy(info->type, "eeprom", I2C_NAME_SIZE); strscpy(info->type, "eeprom", I2C_NAME_SIZE);
return 0; return 0;
} }
......
...@@ -1075,7 +1075,7 @@ static const struct i2c_device_id *idt_ee_match_id(struct fwnode_handle *fwnode) ...@@ -1075,7 +1075,7 @@ static const struct i2c_device_id *idt_ee_match_id(struct fwnode_handle *fwnode)
return NULL; return NULL;
p = strchr(compatible, ','); p = strchr(compatible, ',');
strlcpy(devname, p ? p + 1 : compatible, sizeof(devname)); strscpy(devname, p ? p + 1 : compatible, sizeof(devname));
/* Search through the device name */ /* Search through the device name */
while (id->name[0]) { while (id->name[0]) {
if (strcmp(devname, id->name) == 0) if (strcmp(devname, id->name) == 0)
......
...@@ -424,7 +424,7 @@ static int ics932s401_detect(struct i2c_client *client, ...@@ -424,7 +424,7 @@ static int ics932s401_detect(struct i2c_client *client,
if (revision != ICS932S401_REV) if (revision != ICS932S401_REV)
dev_info(&adapter->dev, "Unknown revision %d\n", revision); 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; return 0;
} }
......
...@@ -471,7 +471,7 @@ static void mei_nfc(struct mei_cl_device *cldev) ...@@ -471,7 +471,7 @@ static void mei_nfc(struct mei_cl_device *cldev)
} }
dev_dbg(bus->dev, "nfc radio %s\n", radio_name); 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: disconnect:
mutex_lock(&bus->device_lock); mutex_lock(&bus->device_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment