Skip to content

Commit

Permalink
mm/zswap.c: switch from strlcpy to strscpy
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Zhiyuan Dai authored and Linus Torvalds committed May 5, 2021
1 parent ca6e51d commit 79cd420
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mm/zswap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 79cd420

Please sign in to comment.