Commit 7a12dd07 authored by Wolfram Sang's avatar Wolfram Sang Committed by Rob Herring
Browse files

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: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20220818210054.7157-1-wsa+renesas@sang-engineering.com
parent e02b4a2f

drivers/of/base.c

+1 −1
Original line number Diff line number Diff line
@@ -1228,7 +1228,7 @@ int of_modalias_node(struct device_node *node, char *modalias, int len) 
	if (!compatible || strlen(compatible) > cplen)

		return -ENODEV;

	p = strchr(compatible, ',');

	strlcpy(modalias, p ? p + 1 : compatible, len);

	strscpy(modalias, p ? p + 1 : compatible, len);

	return 0;

}

EXPORT_SYMBOL_GPL(of_modalias_node);

drivers/of/fdt.c

+3 −3
Original line number Diff line number Diff line
@@ -1178,7 +1178,7 @@ int __init early_init_dt_scan_chosen(char *cmdline) 
	/* Retrieve command line */

	p = of_get_flat_dt_prop(node, "bootargs", &l);

	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
@@ -1190,11 +1190,11 @@ int __init early_init_dt_scan_chosen(char *cmdline) 
	strlcat(cmdline, " ", COMMAND_LINE_SIZE);

	strlcat(cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE);

#elif defined(CONFIG_CMDLINE_FORCE)

	strlcpy(cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE);

	strscpy(cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE);

#else

	/* No arguments from boot loader, use kernel's  cmdl*/

	if (!((char *)cmdline)[0])

		strlcpy(cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE);

		strscpy(cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE);

#endif

#endif /* CONFIG_CMDLINE */

drivers/of/unittest.c

+1 −1
Original line number Diff line number Diff line
@@ -2465,7 +2465,7 @@ static int unittest_i2c_bus_probe(struct platform_device *pdev) 
	adap = &std->adap;

	i2c_set_adapdata(adap, std);

	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->algo = &unittest_i2c_algo;

	adap->dev.parent = dev;