| Message ID | 6635dc9f.d16.181b966989f.Coremail.chenxuebing@jari.cn (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 634b215b73073f91523d6a97e547802aa2483ac8 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: ipconfig: use strscpy to replace strlcpy | expand |
Hello: This patch was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: On Fri, 1 Jul 2022 18:55:17 +0800 (GMT+08:00) you wrote: > The strlcpy should not be used because it doesn't limit the source > length. Preferred is strscpy. > > Signed-off-by: XueBing Chen <chenxuebing@jari.cn> > --- > net/ipv4/ipconfig.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) Here is the summary with links: - net: ipconfig: use strscpy to replace strlcpy https://git.kernel.org/netdev/net-next/c/634b215b7307 You are awesome, thank you!
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index 2342debd7066..e90bc0aa85c7 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c @@ -1765,15 +1765,15 @@ static int __init ip_auto_config_setup(char *addrs) case 4: if ((dp = strchr(ip, '.'))) { *dp++ = '\0'; - strlcpy(utsname()->domainname, dp, + strscpy(utsname()->domainname, dp, sizeof(utsname()->domainname)); } - strlcpy(utsname()->nodename, ip, + strscpy(utsname()->nodename, ip, sizeof(utsname()->nodename)); ic_host_name_set = 1; break; case 5: - strlcpy(user_dev_name, ip, sizeof(user_dev_name)); + strscpy(user_dev_name, ip, sizeof(user_dev_name)); break; case 6: if (ic_proto_name(ip) == 0 && @@ -1820,7 +1820,7 @@ __setup("nfsaddrs=", nfsaddrs_config_setup); static int __init vendor_class_identifier_setup(char *addrs) { - if (strlcpy(vendor_class_identifier, addrs, + if (strscpy(vendor_class_identifier, addrs, sizeof(vendor_class_identifier)) >= sizeof(vendor_class_identifier)) pr_warn("DHCP: vendorclass too long, truncated to \"%s\"\n",
The strlcpy should not be used because it doesn't limit the source length. Preferred is strscpy. Signed-off-by: XueBing Chen <chenxuebing@jari.cn> --- net/ipv4/ipconfig.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)