]> git.baikalelectronics.ru Git - kernel.git/commitdiff
mm/zswap.c: switch from strlcpy to strscpy
authorZhiyuan Dai <daizhiyuan@phytium.com.cn>
Wed, 5 May 2021 01:39:57 +0000 (18:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 May 2021 18:27:27 +0000 (11:27 -0700)
strlcpy is marked as deprecated in Documentation/process/deprecated.rst,
and there is no functional difference when the caller expects truncation
(when not checking the return value).  strscpy is relatively better as
it also avoids scanning the whole source string.

Link: https://lkml.kernel.org/r/1614227981-20367-1-git-send-email-daizhiyuan@phytium.com.cn
Signed-off-by: Zhiyuan Dai <daizhiyuan@phytium.com.cn>
Cc: Seth Jennings <sjenning@redhat.com>
Cc: Dan Streetman <ddstreet@ieee.org>
Cc: Vitaly Wool <vitaly.wool@konsulko.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
mm/zswap.c

index 578d9f25692003ab088098880dc52f44fdd540f3..20763267a219e25828c5b2733d1819c7fc3c81e2 100644 (file)
@@ -614,7 +614,7 @@ static struct zswap_pool *zswap_pool_create(char *type, char *compressor)
        }
        pr_debug("using %s zpool\n", zpool_get_type(pool->zpool));
 
-       strlcpy(pool->tfm_name, compressor, sizeof(pool->tfm_name));
+       strscpy(pool->tfm_name, compressor, sizeof(pool->tfm_name));
 
        pool->acomp_ctx = alloc_percpu(*pool->acomp_ctx);
        if (!pool->acomp_ctx) {