mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
of: 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: Rob Herring <robh@kernel.org> Link: https://lore.kernel.org/r/20220818210054.7157-1-wsa+renesas@sang-engineering.com
This commit is contained in:
parent
e02b4a2fc3
commit
7a12dd077e
3 changed files with 5 additions and 5 deletions
|
@ -1228,7 +1228,7 @@ int of_modalias_node(struct device_node *node, char *modalias, int len)
|
||||||
if (!compatible || strlen(compatible) > cplen)
|
if (!compatible || strlen(compatible) > cplen)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
p = strchr(compatible, ',');
|
p = strchr(compatible, ',');
|
||||||
strlcpy(modalias, p ? p + 1 : compatible, len);
|
strscpy(modalias, p ? p + 1 : compatible, len);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(of_modalias_node);
|
EXPORT_SYMBOL_GPL(of_modalias_node);
|
||||||
|
|
|
@ -1178,7 +1178,7 @@ int __init early_init_dt_scan_chosen(char *cmdline)
|
||||||
/* Retrieve command line */
|
/* Retrieve command line */
|
||||||
p = of_get_flat_dt_prop(node, "bootargs", &l);
|
p = of_get_flat_dt_prop(node, "bootargs", &l);
|
||||||
if (p != NULL && l > 0)
|
if (p != NULL && l > 0)
|
||||||
strlcpy(cmdline, p, min(l, COMMAND_LINE_SIZE));
|
strscpy(cmdline, p, min(l, COMMAND_LINE_SIZE));
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* CONFIG_CMDLINE is meant to be a default in case nothing else
|
* CONFIG_CMDLINE is meant to be a default in case nothing else
|
||||||
|
@ -1190,11 +1190,11 @@ int __init early_init_dt_scan_chosen(char *cmdline)
|
||||||
strlcat(cmdline, " ", COMMAND_LINE_SIZE);
|
strlcat(cmdline, " ", COMMAND_LINE_SIZE);
|
||||||
strlcat(cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
|
strlcat(cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
|
||||||
#elif defined(CONFIG_CMDLINE_FORCE)
|
#elif defined(CONFIG_CMDLINE_FORCE)
|
||||||
strlcpy(cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
|
strscpy(cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
|
||||||
#else
|
#else
|
||||||
/* No arguments from boot loader, use kernel's cmdl*/
|
/* No arguments from boot loader, use kernel's cmdl*/
|
||||||
if (!((char *)cmdline)[0])
|
if (!((char *)cmdline)[0])
|
||||||
strlcpy(cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
|
strscpy(cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
|
||||||
#endif
|
#endif
|
||||||
#endif /* CONFIG_CMDLINE */
|
#endif /* CONFIG_CMDLINE */
|
||||||
|
|
||||||
|
|
|
@ -2465,7 +2465,7 @@ static int unittest_i2c_bus_probe(struct platform_device *pdev)
|
||||||
adap = &std->adap;
|
adap = &std->adap;
|
||||||
i2c_set_adapdata(adap, std);
|
i2c_set_adapdata(adap, std);
|
||||||
adap->nr = -1;
|
adap->nr = -1;
|
||||||
strlcpy(adap->name, pdev->name, sizeof(adap->name));
|
strscpy(adap->name, pdev->name, sizeof(adap->name));
|
||||||
adap->class = I2C_CLASS_DEPRECATED;
|
adap->class = I2C_CLASS_DEPRECATED;
|
||||||
adap->algo = &unittest_i2c_algo;
|
adap->algo = &unittest_i2c_algo;
|
||||||
adap->dev.parent = dev;
|
adap->dev.parent = dev;
|
||||||
|
|
Loading…
Reference in a new issue