Skip to content

Commit

Permalink
power: supply: max1721x: Use strscpy() is more robust and safer
Browse files Browse the repository at this point in the history
The implementation of strscpy() is more robust and safer.

That's now the recommended way to copy NUL terminated strings.

Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
  • Loading branch information
Minghao Chi authored and Sebastian Reichel committed Feb 3, 2023
1 parent 3639dbd commit 301cfbc
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/power/supply/max1721x_battery.c
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ static int devm_w1_max1721x_add_device(struct w1_slave *sl)
}

if (!info->ManufacturerName[0])
strncpy(info->ManufacturerName, DEF_MFG_NAME,
strscpy(info->ManufacturerName, DEF_MFG_NAME,
2 * MAX1721X_REG_MFG_NUMB);

if (get_string(info, MAX1721X_REG_DEV_STR,
Expand All @@ -403,15 +403,15 @@ static int devm_w1_max1721x_add_device(struct w1_slave *sl)

switch (dev_name & MAX172XX_DEV_MASK) {
case MAX172X1_DEV:
strncpy(info->DeviceName, DEF_DEV_NAME_MAX17211,
strscpy(info->DeviceName, DEF_DEV_NAME_MAX17211,
2 * MAX1721X_REG_DEV_NUMB);
break;
case MAX172X5_DEV:
strncpy(info->DeviceName, DEF_DEV_NAME_MAX17215,
strscpy(info->DeviceName, DEF_DEV_NAME_MAX17215,
2 * MAX1721X_REG_DEV_NUMB);
break;
default:
strncpy(info->DeviceName, DEF_DEV_NAME_UNKNOWN,
strscpy(info->DeviceName, DEF_DEV_NAME_UNKNOWN,
2 * MAX1721X_REG_DEV_NUMB);
}
}
Expand Down

0 comments on commit 301cfbc

Please sign in to comment.