tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

authored by

Wolfram Sang and committed by
Rob Herring 7a12dd07 e02b4a2f

+5 -5
+1 -1
drivers/of/base.c
··· 1228 1228 if (!compatible || strlen(compatible) > cplen) 1229 1229 return -ENODEV; 1230 1230 p = strchr(compatible, ','); 1231 - strlcpy(modalias, p ? p + 1 : compatible, len); 1231 + strscpy(modalias, p ? p + 1 : compatible, len); 1232 1232 return 0; 1233 1233 } 1234 1234 EXPORT_SYMBOL_GPL(of_modalias_node);
+3 -3
drivers/of/fdt.c
··· 1178 1178 /* Retrieve command line */ 1179 1179 p = of_get_flat_dt_prop(node, "bootargs", &l); 1180 1180 if (p != NULL && l > 0) 1181 - strlcpy(cmdline, p, min(l, COMMAND_LINE_SIZE)); 1181 + strscpy(cmdline, p, min(l, COMMAND_LINE_SIZE)); 1182 1182 1183 1183 /* 1184 1184 * CONFIG_CMDLINE is meant to be a default in case nothing else ··· 1190 1190 strlcat(cmdline, " ", COMMAND_LINE_SIZE); 1191 1191 strlcat(cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE); 1192 1192 #elif defined(CONFIG_CMDLINE_FORCE) 1193 - strlcpy(cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE); 1193 + strscpy(cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE); 1194 1194 #else 1195 1195 /* No arguments from boot loader, use kernel's cmdl*/ 1196 1196 if (!((char *)cmdline)[0]) 1197 - strlcpy(cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE); 1197 + strscpy(cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE); 1198 1198 #endif 1199 1199 #endif /* CONFIG_CMDLINE */ 1200 1200
+1 -1
drivers/of/unittest.c
··· 2465 2465 adap = &std->adap; 2466 2466 i2c_set_adapdata(adap, std); 2467 2467 adap->nr = -1; 2468 - strlcpy(adap->name, pdev->name, sizeof(adap->name)); 2468 + strscpy(adap->name, pdev->name, sizeof(adap->name)); 2469 2469 adap->class = I2C_CLASS_DEPRECATED; 2470 2470 adap->algo = &unittest_i2c_algo; 2471 2471 adap->dev.parent = dev;