net: sched: Replace strlcpy with strscpy
Subsystems (3)
PATCH 1/1 net: sched: Replace strlcpy with strscpy
strlcpy() reads the entire source buffer first. This read may exceed the destination size limit. This is both inefficient and can lead to linear read overflows if a source string is not NUL-terminated [1]. In an effort to remove strlcpy() completely [2], replace strlcpy() here with strscpy().
Direct replacement is safe here since return value of -errno is used to check for truncation instead of sizeof(dest).
[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
[2] https://github.com/KSPP/linux/issues/89
--- net/sched/act_api.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sched/act_api.c +1 -1
@@ -1320,7 +1320,7 @@ struct tc_action_ops *tc_action_load_ops(struct nlattr *nla, bool police,return ERR_PTR (err); } }else { -if (strlcpy (act_name,"police" ,IFNAMSIZ ) >=IFNAMSIZ ) { +if (strscpy (act_name,"police" ,IFNAMSIZ ) <0 ) {NL_SET_ERR_MSG (extack,"TC action name too long" );return ERR_PTR (-EINVAL ); }
Signature · 1 line
2.41.0.255.g8b1d071c50-goog
Quoted 8 lines · Azeem Shaikh
strlcpy()reads the entire source buffer first. This read may exceed the destination size limit. This is both inefficient and can lead to linear read overflows if a source string is not NUL-terminated [1]. In an effort to removestrlcpy()completely [2], replacestrlcpy()here withstrscpy().
Quoted 8 lines
Direct replacement is safe here since return value of -errno is used to check for truncation instead of sizeof(dest).
[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
[2] https://github.com/KSPP/linux/issues/89Signed-off-by Azeem Shaikh <[email protected]>---
Looks good to me.
Quoted 21 lines
net/sched/act_api.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/sched/act_api.c +1
-2@@ -1320,7 +1320,7 @@ struct tc_action_ops *tc_action_load_ops(struct nlattr *nla, bool police,return ERR_PTR (err); } }else { -if (strlcpy (act_name,"police" ,IFNAMSIZ ) >=IFNAMSIZ ) { +if (strscpy (act_name,"police" ,IFNAMSIZ ) <0 ) {NL_SET_ERR_MSG (extack,"TC action name too long" );return ERR_PTR (-EINVAL ); } --2.41.0.255.g8b1d071c50-goog
This patch was applied to netdev/net.git (main) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:
Quoted 8 lines · On Mon, 10 Jul 2023 03:07:11 +0000 you wrote:
strlcpy()reads the entire source buffer first. This read may exceed the destination size limit. This is both inefficient and can lead to linear read overflows if a source string is not NUL-terminated [1]. In an effort to removestrlcpy()completely [2], replacestrlcpy()here withstrscpy().[...]
Here is the summary with links:
- net: sched: Replace strlcpy with strscpy
https://git.kernel.org/netdev/net/c/989b52cdc849
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html