dlm: Replace all non-returning strlcpy with strscpy
authorAzeem Shaikh <azeemshaikh38@gmail.com>
Wed, 10 May 2023 22:12:37 +0000 (22:12 +0000)
committerKees Cook <keescook@chromium.org>
Mon, 22 May 2023 19:34:09 +0000 (12:34 -0700)
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().
No return values were used, so direct replacement is safe.

[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
[2] https://github.com/KSPP/linux/issues/89

Signed-off-by: Azeem Shaikh <azeemshaikh38@gmail.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20230510221237.3509484-1-azeemshaikh38@gmail.com
fs/dlm/config.c

index d31319d..2beceff 100644 (file)
@@ -116,9 +116,9 @@ static ssize_t cluster_cluster_name_store(struct config_item *item,
 {
        struct dlm_cluster *cl = config_item_to_cluster(item);
 
-       strlcpy(dlm_config.ci_cluster_name, buf,
+       strscpy(dlm_config.ci_cluster_name, buf,
                                sizeof(dlm_config.ci_cluster_name));
-       strlcpy(cl->cl_cluster_name, buf, sizeof(cl->cl_cluster_name));
+       strscpy(cl->cl_cluster_name, buf, sizeof(cl->cl_cluster_name));
        return len;
 }