Skip to content

Commit e1402bd

Browse files
JustinStittsre
authored andcommitted
power: supply: charger-manager: replace deprecated strncpy with strscpy
strncpy() is deprecated for use on NUL-terminated destination strings [1] and as such we should prefer more robust and less ambiguous string interfaces. We expect cm->psy_name_buf to be NUL-terminated based on its usage with format strings: 1522: cm->charger_psy_desc.name = cm->psy_name_buf; ... 1587: dev_err(&pdev->dev, "Cannot register charger-manager with name \"%s\"\n", 1587: cm->charger_psy_desc.name); Moreover, NUL-padding is not required as `cm` is already zero-allocated and thus any future NUL-byte assignments (like what strncpy() will do) are redundant: 1437: cm = devm_kzalloc(&pdev->dev, sizeof(*cm), GFP_KERNEL); Considering the above, a suitable replacement is `strscpy` [2] due to the fact that it guarantees NUL-termination on the destination buffer without unnecessarily NUL-padding. Let's also opt for the more idiomatic strscpy() usage of: strscpy(dest, src, sizeof(dest)). Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [1] Link: https://manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html [2] Link: KSPP#90 Cc: [email protected] Signed-off-by: Justin Stitt <[email protected]> Link: https://lore.kernel.org/r/20231020-strncpy-drivers-power-supply-charger-manager-c-v1-1-698f73bcad2a@google.com Signed-off-by: Sebastian Reichel <[email protected]>
1 parent afb0379 commit e1402bd

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/power/supply/charger-manager.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1516,9 +1516,11 @@ static int charger_manager_probe(struct platform_device *pdev)
15161516
memcpy(&cm->charger_psy_desc, &psy_default, sizeof(psy_default));
15171517

15181518
if (!desc->psy_name)
1519-
strncpy(cm->psy_name_buf, psy_default.name, PSY_NAME_MAX);
1519+
strscpy(cm->psy_name_buf, psy_default.name,
1520+
sizeof(cm->psy_name_buf));
15201521
else
1521-
strncpy(cm->psy_name_buf, desc->psy_name, PSY_NAME_MAX);
1522+
strscpy(cm->psy_name_buf, desc->psy_name,
1523+
sizeof(cm->psy_name_buf));
15221524
cm->charger_psy_desc.name = cm->psy_name_buf;
15231525

15241526
/* Allocate for psy properties because they may vary */

0 commit comments

Comments
 (0)