net: ipconfig: replace strncpy with strscpy
Subsystems (3)
PATCH 1/1 net: ipconfig: replace strncpy with strscpy
Replace the deprecated strncpy() with strscpy() as the destination buffer is NUL-terminated and does not require any trailing NUL-padding.
--- net/ipv4/ipconfig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/ipconfig.c +1 -1
@@ -1690,7 +1690,7 @@ static int __init ic_proto_name(char *name) *v =0 ;if (kstrtou8 (client_id,0 , dhcp_client_identifier))pr_debug ("DHCP: Invalid client identifier type\n" ); -strncpy (dhcp_client_identifier +1 , v +1 ,251 ); +strscpy (dhcp_client_identifier +1 , v +1 ,251 ); *v =',' ; }return 1 ;
Signature · 1 line
2.49.0
Quoted 5 lines · Pranav Tyagi
Replace the deprecated
strncpy()withstrscpy()as the destination buffer is NUL-terminated and does not require any trailing NUL-padding.Signed-off-by Pranav Tyagi <[email protected]>
Thanks,
I agree that strscpy() is the correct choice here for the reasons you give above.
Quoted 9 lines
--- net/ipv4/ipconfig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/ipv4/ipconfig.c +0
-0
net/ipv4/ipconfig.c static int __init ic_proto_name(char *name) · line 1693
Quoted 5 lines
net/ipv4/ipconfig.c +1
-1@@ -1690,7 +1690,7 @@ static int __init ic_proto_name(char *name) *v =0 ;if (kstrtou8 (client_id,0 , dhcp_client_identifier))pr_debug ("DHCP: Invalid client identifier type\n" ); -strncpy (dhcp_client_identifier +1 , v +1 ,251 ); +strscpy (dhcp_client_identifier +1 , v +1 ,251 );
As an aside, I'm curious to know why the length is 251 rather than 252 (sizeof(dhcp_client_identifier) -1). But that isn't strictly related to this patch.
Quoted 6 lines
net/ipv4/ipconfig.c +0
-0*v =',' ; }return 1 ;Signature · 1 line
2.49.0
Jakub Kicinski
maintainerQuoted 10 lines · On Tue, 15 Apr 2025 17:35:36 +0100 Simon Horman wrote:
net/ipv4/ipconfig.c static int __init ic_proto_name(char *name) · line 1693
Quoted 6 lines
net/ipv4/ipconfig.c +1
-1@@ -1690,7 +1690,7 @@ static int __init ic_proto_name(char *name) *v =0 ;if (kstrtou8 (client_id,0 , dhcp_client_identifier))pr_debug ("DHCP: Invalid client identifier type\n" ); -strncpy (dhcp_client_identifier +1 , v +1 ,251 ); +strscpy (dhcp_client_identifier +1 , v +1 ,251 );As an aside, I'm curious to know why the length is 251 rather than 252 (
sizeof(dhcp_client_identifier)-1). But that isn't strictly related to this patch.
Isn't this because strncpy() doesn't nul-terminate, and since this is a static variable if we use len - 1 we guarantee that there will be a null byte at the end? If we switch to strscpy we'll make the max string len 1 char shorter.
Simon Horman
reviewerQuoted 12 lines · Jakub Kicinski
Quoted 10 lines · On Tue, 15 Apr 2025 17:35:36 +0100 Simon Horman wrote:
net/ipv4/ipconfig.c static int __init ic_proto_name(char *name) · line 1693
Quoted 6 lines
net/ipv4/ipconfig.c +1
-1@@ -1690,7 +1690,7 @@ static int __init ic_proto_name(char *name) *v =0 ;if (kstrtou8 (client_id,0 , dhcp_client_identifier))pr_debug ("DHCP: Invalid client identifier type\n" ); -strncpy (dhcp_client_identifier +1 , v +1 ,251 ); +strscpy (dhcp_client_identifier +1 , v +1 ,251 );As an aside, I'm curious to know why the length is 251 rather than 252 (
sizeof(dhcp_client_identifier)-1). But that isn't strictly related to this patch.
Quoted 4 lines
Isn't this because
strncpy()doesn't nul-terminate, and since this is a static variable if we use len - 1 we guarantee that there will be a null byte at the end? If we switch to strscpy we'll make the max string len 1 char shorter.
Yes, that makes sense to me.
And so I think the patch should also increase 251 to 252.
Quoted 14 lines · Simon Horman
Quoted 12 lines · Jakub Kicinski
Quoted 10 lines · On Tue, 15 Apr 2025 17:35:36 +0100 Simon Horman wrote:
net/ipv4/ipconfig.c static int __init ic_proto_name(char *name) · line 1693
Quoted 6 lines
net/ipv4/ipconfig.c +1
-1@@ -1690,7 +1690,7 @@ static int __init ic_proto_name(char *name) *v =0 ;if (kstrtou8 (client_id,0 , dhcp_client_identifier))pr_debug ("DHCP: Invalid client identifier type\n" ); -strncpy (dhcp_client_identifier +1 , v +1 ,251 ); +strscpy (dhcp_client_identifier +1 , v +1 ,251 );As an aside, I'm curious to know why the length is 251 rather than 252 (
sizeof(dhcp_client_identifier)-1). But that isn't strictly related to this patch.
Quoted 7 lines
Quoted 4 lines
Isn't this because
strncpy()doesn't nul-terminate, and since this is a static variable if we use len - 1 we guarantee that there will be a null byte at the end? If we switch to strscpy we'll make the max string len 1 char shorter.Yes, that makes sense to me.
And so I think the patch should also increase 251 to 252.
Thanks for pointing that out. I appreciate the feedback and will send an updated version with the suggested change. Regards